[FFmpeg-cvslog] oggdec: Leave treatment of serial changes to the decoder.

Michael Niedermayer git at videolan.org
Tue Jan 15 21:14:33 CET 2013


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 13 21:32:34 2013 +0100| [1c373456f6388f8817d20c49471d00dc9e7e755d] | committer: Carl Eugen Hoyos

oggdec: Leave treatment of serial changes to the decoder.

Attempting to re-parse the headers at demuxer level is a
pandora box the way its done currently.

This allows full reconfiguration of vorbis streams

Fixes Ticket2117
Fixes Ticket2121

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c994bb2fb7727f5c20ef71cc6727fb219fd49d60)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c373456f6388f8817d20c49471d00dc9e7e755d
---

 libavformat/oggdec.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 6195747..c0a9508 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -185,6 +185,9 @@ static int ogg_replace_stream(AVFormatContext *s, uint32_t serial)
 
     os = &ogg->streams[0];
 
+    os->serial  = serial;
+    return 0;
+
     buf     = os->buf;
     bufsize = os->bufsize;
     codec   = os->codec;



More information about the ffmpeg-cvslog mailing list