summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2008-08-28 18:03:26 +0000
committerEdward Hervey <bilboed@bilboed.com>2008-08-28 18:03:26 +0000
commit35168b4a41c275a85ce68ecbeb0469fc387b8491 (patch)
treeee7fc7579c8a865e8e5e89d9db15341075c3d1f5
parent7bb23479a13bbae0384c89d7764719ee359e7c65 (diff)
downloadgst-libav-35168b4a41c275a85ce68ecbeb0469fc387b8491.tar.gz
ext/ffmpeg/gstffmpegcodecmap.c: ffmpeg audio decoders can now do up to 6 channels... and actually expose it properly....
Original commit message from CVS: * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ff_aud_caps_new): ffmpeg audio decoders can now do up to 6 channels... and actually expose it properly. Don't expect any channel mapping though.
-rw-r--r--ChangeLog6
-rw-r--r--ext/ffmpeg/gstffmpegcodecmap.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0db4ff4..454c392 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-08-28 Edward Hervey <edward.hervey@collabora.co.uk>
+ * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ff_aud_caps_new):
+ ffmpeg audio decoders can now do up to 6 channels... and actually
+ expose it properly. Don't expect any channel mapping though.
+
+2008-08-28 Edward Hervey <edward.hervey@collabora.co.uk>
+
* configure.ac:
Slim down the build of 'prefered' ffmpeg snapshot to disable compilation
of things we don't need.
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 872648c..b25cdb9 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -171,7 +171,7 @@ gst_ff_aud_caps_new (AVCodecContext * context, enum CodecID codec_id,
} else {
caps = gst_caps_new_simple (mimetype,
"rate", GST_TYPE_INT_RANGE, 8000, 96000,
- "channels", GST_TYPE_INT_RANGE, 1, 2, NULL);
+ "channels", GST_TYPE_INT_RANGE, 1, 6, NULL);
}