diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 09:56:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 10:06:42 +0200 |
| commit | 0c7bd340230635676507dbca998d04878c0117da (patch) | |
| tree | 025844c5f4656fd1c9c8691be3988cd915875c86 /libavformat | |
| parent | 77caa31f717a0cab628c05fcd61cf6d78fba527e (diff) | |
| parent | fd2384f02b905a106fba9222ece4ddbe2ec61937 (diff) | |
| download | ffmpeg-0c7bd340230635676507dbca998d04878c0117da.tar.gz | |
Merge commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937'
* commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937':
oggparsevorbis: fail on memory allocation error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/oggparsevorbis.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index e031c7b0b3..36ad7384ea 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -120,9 +120,7 @@ int ff_vorbis_comment(AVFormatContext *as, AVDictionary **m, if (!tt || !ct) { av_freep(&tt); av_freep(&ct); - av_log(as, AV_LOG_WARNING, - "out-of-memory error. skipping VorbisComment tag.\n"); - continue; + return AVERROR(ENOMEM); } for (j = 0; j < tl; j++) |