Merge commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937'

* commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937':
  oggparsevorbis: fail on memory allocation error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-13 09:56:56 +02:00
commit 0c7bd34023

View File

@ -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++)