diff options
| author | Jeremy Simon <jsimon13@yahoo.fr> | 2003-11-05 23:06:27 +0000 |
|---|---|---|
| committer | Jeremy Simon <jsimon13@yahoo.fr> | 2003-11-05 23:06:27 +0000 |
| commit | 6b317324b54c1a044f3c6a260229646f0c9ff846 (patch) | |
| tree | c328abed411428d9227ce4a8650c6f2d8b7e69f1 /gst-libs/ext/ffmpeg/patch | |
| parent | 2c0266b2bba86e944294e8bdc44b4cda83f5717a (diff) | |
| download | gst-plugins-bad-6b317324b54c1a044f3c6a260229646f0c9ff846.tar.gz gst-plugins-bad-6b317324b54c1a044f3c6a260229646f0c9ff846.tar.bz2 gst-plugins-bad-6b317324b54c1a044f3c6a260229646f0c9ff846.zip | |
Patch avcodec.h and wmadec.c to use flag1 and flag2 from context
Original commit message from CVS:
Patch avcodec.h and wmadec.c to use flag1 and flag2 from context
The asfdemux calculates the 2 values and gives them to the decoder via the pad/caps
The ffdec_wmav1 & ffdec_wmav2 put them in the ffmpeg context before they start to decode the data
Diffstat (limited to 'gst-libs/ext/ffmpeg/patch')
| -rw-r--r-- | gst-libs/ext/ffmpeg/patch/function.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/gst-libs/ext/ffmpeg/patch/function.patch b/gst-libs/ext/ffmpeg/patch/function.patch index 96aebe50..06ee65f3 100644 --- a/gst-libs/ext/ffmpeg/patch/function.patch +++ b/gst-libs/ext/ffmpeg/patch/function.patch @@ -129,3 +129,55 @@ diff -u -u -r1.23 wav.c fourxm_init(); #ifdef CONFIG_ENCODERS flvenc_init(); +Index: ffmpeg/libavcodec/avcodec.h +=================================================================== +RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/avcodec.h,v +retrieving revision 1.237 +diff -a -u -r1.237 avcodec.h +--- ffmpeg/libavcodec/avcodec.h 22 Oct 2003 18:26:38 -0000 1.237 ++++ ffmpeg/libavcodec/avcodec.h 5 Nov 2003 22:54:53 -0000 +@@ -1341,6 +1341,9 @@ + * - decoding: unused + */ + int lmax; ++ ++ /* Added for ffmpeg gstreamer plugin (ffdec_wmav1 & ffdec_wmav2) */ ++ int wma_flags1, wma_flags2; + + } AVCodecContext; + +Index: ffmpeg/libavcodec/wmadec.c +=================================================================== +RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/wmadec.c,v +retrieving revision 1.18 +diff -a -u -r1.18 wmadec.c +--- ffmpeg/libavcodec/wmadec.c 4 Jul 2003 20:32:04 -0000 1.18 ++++ ffmpeg/libavcodec/wmadec.c 5 Nov 2003 22:56:01 -0000 +@@ -214,9 +214,15 @@ + s->version = 2; + } + +- /* extract flag infos */ +- flags1 = 0; +- flags2 = 0; ++ /* extract flag infos ++ * Get wma flags from context : modification for gstreamer ++ * ffmpegdec get these values from sink caps and put them in the context ++ */ ++ flags1 = avctx->wma_flags1; ++ flags2 = avctx->wma_flags2; ++ ++ /* The gstreamer asfdemux computed already these flags */ ++ /* + extradata = avctx->extradata; + if (s->version == 1 && avctx->extradata_size >= 4) { + flags1 = extradata[0] | (extradata[1] << 8); +@@ -225,7 +231,7 @@ + flags1 = extradata[0] | (extradata[1] << 8) | + (extradata[2] << 16) | (extradata[3] << 24); + flags2 = extradata[4] | (extradata[5] << 8); +- } ++ }*/ + s->use_exp_vlc = flags2 & 0x0001; + s->use_bit_reservoir = flags2 & 0x0002; + s->use_variable_block_len = flags2 & 0x0004; |