vlc | branch: master | Francois Cartegnie <[email protected]> | Thu Nov 28 10:01:52 2013 +0100| [b1946d46a3c251159dd31e26b4a2dea1a428a4a4] | committer: Francois Cartegnie
demux: ogg: don't double read wrong fix for cid #1048729 bs_read in __MAX macro forwards read pointer twice > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b1946d46a3c251159dd31e26b4a2dea1a428a4a4 --- modules/demux/ogg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c index a9c7ceb..592b505 100644 --- a/modules/demux/ogg.c +++ b/modules/demux/ogg.c @@ -2183,7 +2183,8 @@ static void Ogg_ReadTheoraHeader( logical_stream_t *p_stream, bs_read( &bitstream, 8 ); /* y offset */ i_fps_numerator = bs_read( &bitstream, 32 ); - i_fps_denominator = __MAX( bs_read( &bitstream, 32 ), (uint32_t) 1 ); + i_fps_denominator = bs_read( &bitstream, 32 ); + i_fps_denominator = __MAX( i_fps_denominator, 1 ); bs_read( &bitstream, 24 ); /* aspect_numerator */ bs_read( &bitstream, 24 ); /* aspect_denominator */ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
