diff options
author | Sebastian Dröge <slomo@circular-chaos.org> | 2008-12-24 08:09:53 +0000 |
---|---|---|
committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-12-24 08:09:53 +0000 |
commit | 01c49178c05263d0994eb1993eb5ffa93957a5af (patch) | |
tree | 8af4abfb496c733ea2a004ded37b53a61e5e12f9 /ext/ffmpeg/gstffmpegcodecmap.c | |
parent | 3d089f4862e8ad4ee4c296962d43e85d0634e596 (diff) |
ffmpegrev: Updating ffmpeg SVN revision to r16304 and update to the corresponding swscale snapshot.
Original commit message from CVS:
* ffmpegrev:
Updating ffmpeg SVN revision to r16304 and update to the corresponding
swscale snapshot.
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_to_codecid):
Enable the Real Video 3.0 decoder.
Diffstat (limited to 'ext/ffmpeg/gstffmpegcodecmap.c')
-rw-r--r-- | ext/ffmpeg/gstffmpegcodecmap.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index 75b7b77..e945fd2 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -1681,25 +1681,25 @@ gst_ffmpeg_caps_to_smpfmt (const GstCaps * caps, if (!strcmp (gst_structure_get_name (structure), "audio/x-raw-float")) { /* FLOAT */ if (gst_structure_get_int (structure, "width", &width) && - gst_structure_get_int (structure, "endianness", &endianness)) { + gst_structure_get_int (structure, "endianness", &endianness)) { if (endianness == G_BYTE_ORDER) { - if (width == 32) - context->sample_fmt = SAMPLE_FMT_FLT; - else if (width == 64) - context->sample_fmt = SAMPLE_FMT_DBL; + if (width == 32) + context->sample_fmt = SAMPLE_FMT_FLT; + else if (width == 64) + context->sample_fmt = SAMPLE_FMT_DBL; } } } else { /* INT */ if (gst_structure_get_int (structure, "width", &width) && - gst_structure_get_int (structure, "depth", &depth) && - gst_structure_get_boolean (structure, "signed", &signedness) && - gst_structure_get_int (structure, "endianness", &endianness)) { + gst_structure_get_int (structure, "depth", &depth) && + gst_structure_get_boolean (structure, "signed", &signedness) && + gst_structure_get_int (structure, "endianness", &endianness)) { if ((endianness == G_BYTE_ORDER) && (signedness == TRUE)) { - if ((width == 16) && (depth == 16)) - context->sample_fmt = SAMPLE_FMT_S16; - else if ((width == 32) && (depth == 32)) - context->sample_fmt = SAMPLE_FMT_S32; + if ((width == 16) && (depth == 16)) + context->sample_fmt = SAMPLE_FMT_S16; + else if ((width == 32) && (depth == 32)) + context->sample_fmt = SAMPLE_FMT_S32; } } } @@ -2815,6 +2815,9 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context) case 2: id = CODEC_ID_RV20; break; + case 3: + id = CODEC_ID_RV30; + break; case 4: id = CODEC_ID_RV40; break; |