mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-01 01:33:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

ffmpegrev: Updating ffmpeg SVN revision to r16304 and update to the corresponding swscale snapshot.

Browse source 
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.
This commit is contained in:
Sebastian Dröge 2008-12-24 08:09:53 +00:00
parent 3d089f4862
commit 01c49178c0
4 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-12-24 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* 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.
2008-12-17 Edward Hervey <edward.hervey@collabora.co.uk> 2008-12-17 Edward Hervey <edward.hervey@collabora.co.uk>
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ff_aud_caps_new), * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ff_aud_caps_new),

2
common

@ -1 +1 @@
Subproject commit 2c4d28a75c26e572b94a967901254caff83d85c4 Subproject commit 5dc8ae302733ce1aae5b1aaa613ce77a8ae4b3d9

27
ext/ffmpeg/gstffmpegcodecmap.c
View file

@ -1681,25 +1681,25 @@ gst_ffmpeg_caps_to_smpfmt (const GstCaps * caps,
if (!strcmp (gst_structure_get_name (structure), "audio/x-raw-float")) { if (!strcmp (gst_structure_get_name (structure), "audio/x-raw-float")) {
/* FLOAT */ /* FLOAT */
if (gst_structure_get_int (structure, "width", &width) && 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 (endianness == G_BYTE_ORDER) {
if (width == 32) if (width == 32)
context->sample_fmt = SAMPLE_FMT_FLT; context->sample_fmt = SAMPLE_FMT_FLT;
else if (width == 64) else if (width == 64)
context->sample_fmt = SAMPLE_FMT_DBL; context->sample_fmt = SAMPLE_FMT_DBL;
} }
} }
} else { } else {
/* INT */ /* INT */
if (gst_structure_get_int (structure, "width", &width) && if (gst_structure_get_int (structure, "width", &width) &&
gst_structure_get_int (structure, "depth", &depth) && gst_structure_get_int (structure, "depth", &depth) &&
gst_structure_get_boolean (structure, "signed", &signedness) && gst_structure_get_boolean (structure, "signed", &signedness) &&
gst_structure_get_int (structure, "endianness", &endianness)) { gst_structure_get_int (structure, "endianness", &endianness)) {
if ((endianness == G_BYTE_ORDER) && (signedness == TRUE)) { if ((endianness == G_BYTE_ORDER) && (signedness == TRUE)) {
if ((width == 16) && (depth == 16)) if ((width == 16) && (depth == 16))
context->sample_fmt = SAMPLE_FMT_S16; context->sample_fmt = SAMPLE_FMT_S16;
else if ((width == 32) && (depth == 32)) else if ((width == 32) && (depth == 32))
context->sample_fmt = SAMPLE_FMT_S32; context->sample_fmt = SAMPLE_FMT_S32;
} }
} }
} }
@ -2815,6 +2815,9 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
case 2: case 2:
id = CODEC_ID_RV20; id = CODEC_ID_RV20;
break; break;
case 3:
id = CODEC_ID_RV30;
break;
case 4: case 4:
id = CODEC_ID_RV40; id = CODEC_ID_RV40;
break; break;

6
ffmpegrev
View file

@ -1,8 +1,8 @@
FFMPEG_REVISION=16086 FFMPEG_REVISION=16304
FFMPEG_CO_DIR=gst-libs/ext/ffmpeg FFMPEG_CO_DIR=gst-libs/ext/ffmpeg
FFMPEG_SVN=svn://svn.mplayerhq.hu/ffmpeg/trunk FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
# Because ffmpeg checks out libswscale via an svn:externals, checking # Because ffmpeg checks out libswscale via an svn:externals, checking
# out an old ffmpeg does not check out a corresponding libswscale. # out an old ffmpeg does not check out a corresponding libswscale.
# Keep the swscale checkout manually synchronized, then. Update this # Keep the swscale checkout manually synchronized, then. Update this
# when you update FFMPEG_REVISION. # when you update FFMPEG_REVISION.
FFMPEG_EXTERNALS_UPDATE="cd $FFMPEG_CO_DIR/libswscale && svn up -r '{2008-12-13 07:35:00 +0100}'" FFMPEG_EXTERNALS_UPDATE="cd $FFMPEG_CO_DIR/libswscale && svn up -r '{2008-12-24 09:04:00 +0100}'"