Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: patches/to_upstream/11_mkv_buffer_overflow.patch

Issue 3066011: ffmpeg configured with webm decode only to avoid postproc that pulls in unuse... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
Property Changes:
Added: svn:eol-style
+ LF
OLDNEW
1 diff -rpu -N orig/libavformat/matroskadec.c ffmpeg-mt/libavformat/matroskadec.c 1 diff -rpu -N orig/libavformat/matroskadec.c ffmpeg-mt/libavformat/matroskadec.c
2 --- orig/libavformat/matroskadec.c» 2010-07-19 12:54:00.462379500 -0700 2 --- orig/libavformat/matroskadec.c» 2010-07-27 13:08:26.240398300 -0700
3 +++ ffmpeg-mt/libavformat/matroskadec.c»2010-07-19 12:54:01.928779500 -0700 3 +++ ffmpeg-mt/libavformat/matroskadec.c»2010-07-27 13:08:27.346508900 -0700
4 @@ -34,13 +34,17 @@ 4 @@ -34,13 +34,17 @@
5 /* For ff_codec_get_id(). */ 5 /* For ff_codec_get_id(). */
6 #include "riff.h" 6 #include "riff.h"
7 #include "isom.h" 7 #include "isom.h"
8 +#if CONFIG_SIPR_DECODER 8 +#if CONFIG_SIPR_DECODER
9 #include "rm.h" 9 #include "rm.h"
10 +#endif 10 +#endif
11 #include "matroska.h" 11 #include "matroska.h"
12 #include "libavcodec/mpeg4audio.h" 12 #include "libavcodec/mpeg4audio.h"
13 #include "libavutil/intfloat_readwrite.h" 13 #include "libavutil/intfloat_readwrite.h"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 memcpy(track->audio.buf+sps*(h*x+((h+1)/2)*(y&1)+(y >>1)), data+x*sps, sps); 125 memcpy(track->audio.buf+sps*(h*x+((h+1)/2)*(y&1)+(y >>1)), data+x*sps, sps);
126 126
127 if (++track->audio.sub_packet_cnt >= h) { 127 if (++track->audio.sub_packet_cnt >= h) {
128 +#if CONFIG_SIPR_DECODER 128 +#if CONFIG_SIPR_DECODER
129 if (st->codec->codec_id == CODEC_ID_SIPR) 129 if (st->codec->codec_id == CODEC_ID_SIPR)
130 ff_rm_reorder_sipr_data(track->audio.buf, h, w); 130 ff_rm_reorder_sipr_data(track->audio.buf, h, w);
131 +#endif 131 +#endif
132 track->audio.sub_packet_cnt = 0; 132 track->audio.sub_packet_cnt = 0;
133 track->audio.pkt_cnt = h*w / a; 133 track->audio.pkt_cnt = h*w / a;
134 } 134 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698