diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-04 04:08:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-04 04:08:46 +0100 |
| commit | 6072a19b4f311cb172d45e90daad90824e40e4b6 (patch) | |
| tree | 2366f3155b5c03aa2f03a044f191dc4ccf8ba45c /libavformat | |
| parent | f37174bc1913d534913e8825f1609a637cc4b364 (diff) | |
| download | ffmpeg-6072a19b4f311cb172d45e90daad90824e40e4b6.tar.gz | |
lavf: Fix try_decode_frame() so it doesnt loop infinitely.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index e8fefe6514..2eba3bafc1 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2273,6 +2273,8 @@ static int try_decode_frame(AVStream *st, AVPacket *avpkt, AVDictionary **option pkt.size -= ret; } } + if(!pkt.data && !got_picture) + return -1; return ret; } |