aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-07 01:16:14 +0100
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-27 00:38:56 +0100
commite6197a6ce986af0d2f29ed0b649f3ed531a6d66e (patch)
tree43adbf8c53c18961fdef1e526c1c6664730e4f6c
parente78d9f3f35e379ab7da729360e3eb5ad39c150fa (diff)
downloadffmpeg-e6197a6ce986af0d2f29ed0b649f3ed531a6d66e.tar.gz
mpegaudio_parser: don't return AVERROR_PATCHWELCOME
The API does not allow returning AVERROR codes. It triggers an assert in av_parser_parse2. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 5249706e9d2ec5ed1b07d8ffdbb8fb9104261f6d) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-rw-r--r--libavcodec/mpegaudio_parser.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c
index 873f941237..8c39825792 100644
--- a/libavcodec/mpegaudio_parser.c
+++ b/libavcodec/mpegaudio_parser.c
@@ -98,7 +98,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
} else if (codec_id == AV_CODEC_ID_MP3ADU) {
avpriv_report_missing_feature(avctx,
"MP3ADU full parser");
- return AVERROR_PATCHWELCOME;
+ return 0; /* parsers must not return error codes */
}
break;