diff mbox

[FFmpeg-devel] mpegaudio_parser: don't return AVERROR_PATCHWELCOME

Message ID 46b7fb0a-63ef-03e2-adf7-ba7b85b23af2@googlemail.com
State Accepted
Commit 5249706e9d2ec5ed1b07d8ffdbb8fb9104261f6d
Headers show

Commit Message

Andreas Cadhalpun Nov. 7, 2016, 12:21 a.m. UTC
The API does not allow returning AVERROR codes.

It triggers an assert in av_parser_parse2.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
---
 libavcodec/mpegaudio_parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer Nov. 7, 2016, 9:23 a.m. UTC | #1
On Mon, Nov 07, 2016 at 01:21:01AM +0100, Andreas Cadhalpun wrote:
> The API does not allow returning AVERROR codes.
> 
> It triggers an assert in av_parser_parse2.
> 
> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
> ---
>  libavcodec/mpegaudio_parser.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

probably ok

[...]
Andreas Cadhalpun Nov. 7, 2016, 6:51 p.m. UTC | #2
On 07.11.2016 10:23, Michael Niedermayer wrote:
> On Mon, Nov 07, 2016 at 01:21:01AM +0100, Andreas Cadhalpun wrote:
>> The API does not allow returning AVERROR codes.
>>
>> It triggers an assert in av_parser_parse2.
>>
>> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
>> ---
>>  libavcodec/mpegaudio_parser.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> probably ok

Pushed.

Best regards,
Andreas
diff mbox

Patch

diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c
index 873f941..8c39825 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;