summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-01-25 16:56:45 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-01-25 16:56:45 +0000
commit1a851d7ff67d9c1a06c8143c0cb3645c1ecf18e7 (patch)
tree5d53d5e712a384503354fabb4119f3092cde3fa5
parent6437f380306623b0aefb75d65d2364159a4cb753 (diff)
downloadgst-libav-1a851d7ff67d9c1a06c8143c0cb3645c1ecf18e7.tar.gz
ext/ffmpeg/gstffmpegdec.c: <insert rant about why gcc should support parsing errors>.
Original commit message from CVS: * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_negotiate): <insert rant about why gcc should support parsing errors>.
-rw-r--r--ChangeLog5
-rw-r--r--ext/ffmpeg/gstffmpegdec.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ae0181a..03b8004 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-01-25 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_negotiate):
+ <insert rant about why gcc should support parsing errors>.
+
+2005-01-25 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
(gst_ffmpeg_pixfmt_to_caps), (gst_ffmpeg_caps_to_pixfmt):
Add extradata to huffyuv, sync RGBA32 up with gst-plugins.
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 386a41c..86db135 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -509,7 +509,7 @@ gst_ffmpegdec_negotiate (GstFFMpegDec * ffmpegdec)
ffmpegdec->format.audio.samplerate, ffmpegdec->format.audio.channels,
ffmpegdec->context->sample_rate, ffmpegdec->context->channels);
ffmpegdec->format.audio.samplerate = ffmpegdec->context->sample_rate;
- ffmpegdec->format.audio.channels == ffmpegdec->context->channels;
+ ffmpegdec->format.audio.channels = ffmpegdec->context->channels;
break;
default:
break;