diff options
| author | Piotr Bandurski <ami_stuff@o2.pl> | 2013-07-10 14:57:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-11 12:02:33 +0200 |
| commit | c1c84f0a55f88ed25caa1e690aeeb5cf61204d3e (patch) | |
| tree | 36faa788e8b41063178d9dab6a1406ea0057fcc5 | |
| parent | 56bf38859b93dea7ac2fbacb3ba2425d77917dc9 (diff) | |
| download | ffmpeg-c1c84f0a55f88ed25caa1e690aeeb5cf61204d3e.tar.gz | |
avformat/utils: avformat_find_stream_info set value for ret in case of oom
without it FFmpeg didn't display any error message when oom event occured
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b0509563347b81d7b0a2474e56abbc9c99043688)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index f607be789d..bdee64484b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2783,8 +2783,10 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) } else { pkt = add_to_pktbuf(&ic->packet_buffer, &pkt1, &ic->packet_buffer_end); - if (!pkt) + if (!pkt) { + ret = AVERROR(ENOMEM); goto find_stream_info_err; + } if ((ret = av_dup_packet(pkt)) < 0) goto find_stream_info_err; } |