wtay gst-ffmpeg: gst-ffmpeg/ gst-ffmpeg/ext/ffmpeg/

--===============0407777984219804633==

CVS Root:       /cvs/gstreamer
Module:         gst-ffmpeg
Changes by:     wtay
Date:           Mon Jan 05 2009  18:08:34 UTC

Log message:
Patch by: Dejan Sakelšak <sakdean at gmail dot com>
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ff_aud_caps_new):
Narrow down the allowed channels and sample rates for AMR.
Fixes #566647.

Modified files:
    .               : ChangeLog
    ext/ffmpeg      : gstffmpegcodecmap.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.542&r2=1.543
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.c.diff?r1=1.177&r2=1.178

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-ffmpeg/ChangeLog,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -d -r1.542 -r1.543
--- ChangeLog	5 Jan 2009 11:15:44 -0000	1.542
+++ ChangeLog	5 Jan 2009 18:08:19 -0000	1.543
@@ -1,3 +1,11 @@
+2009-01-05  Wim Taymans  <[email protected]>
+
+	Patch by: Dejan Sakelšak <sakdean at gmail dot com>
+	* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ff_aud_caps_new):
+	Narrow down the allowed channels and sample rates for AMR.
+	Fixes #566647.
 2009-01-05  Sebastian Dröge  <[email protected]>
 
 	* ffmpegrev:
Index: gstffmpegcodecmap.c
RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.c,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- gstffmpegcodecmap.c	30 Dec 2008 15:59:58 -0000	1.177
+++ gstffmpegcodecmap.c	5 Jan 2009 18:08:20 -0000	1.178
@@ -347,6 +347,22 @@
         case CODEC_ID_ADPCM_G726:
           maxchannels = 1;
           break;
+        case CODEC_ID_AMR_NB:
+        {
+          const static gint l_rates[] = { 8000 };
+          maxchannels = 1;
+          n_rates = G_N_ELEMENTS (l_rates);
+          rates = l_rates;
+          break;
+        }
+        case CODEC_ID_AMR_WB:
+          const static gint l_rates[] = { 16000 };
         default:
       }


--===============0407777984219804633==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

------------------------------------------------------------------------------

--===============0407777984219804633==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose

--===============0407777984219804633==--