summaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2009-03-04 05:40:53 +0000
committerMike Melanson <mike@multimedia.cx>2009-03-04 05:40:53 +0000
commite584914acddaeb21f5258d9947b530fbd9421ab8 (patch)
tree100d76409f9869cec7442f8c22f41738b742d41a /libavformat
parent45e5f85777c91430c5940b21d4eec6a22877c12d (diff)
downloadffmpeg-streaming-e584914acddaeb21f5258d9947b530fbd9421ab8.zip
ffmpeg-streaming-e584914acddaeb21f5258d9947b530fbd9421ab8.tar.gz
Fix a condition that causes an infinite loop, but only when compiled with
gcc 4.2.4 on x86_32. Thanks to Vitor for hunting this down. Originally committed as revision 17802 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/wc3movie.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c
index 6d7592f..59b11ae 100644
--- a/libavformat/wc3movie.c
+++ b/libavformat/wc3movie.c
@@ -293,7 +293,7 @@ static int wc3_read_packet(AVFormatContext *s,
/* get the next chunk preamble */
if ((ret = get_buffer(pb, preamble, WC3_PREAMBLE_SIZE)) !=
WC3_PREAMBLE_SIZE)
- ret = AVERROR(EIO);
+ return AVERROR(EIO);
fourcc_tag = AV_RL32(&preamble[0]);
/* chunk sizes are 16-bit aligned */
OpenPOWER on IntegriCloud