[FFmpeg-devel] [PATCH]ffmpeg: Check the return values of two functions

[Carl Eugen Hoyos]

2017-02-12 17:00 GMT+01:00 Nicolas George <george at nsup.org>:
> Le quartidi 24 pluviôse, an CCXXV, Carl Eugen Hoyos a écrit :
>> Hi!
>>
>> Attached patch written yesterday silences warnings when compiling
>> ffmpeg.c, don't know how useful it is, only fate-tested.
>>
>> Please comment, Carl Eugen
>
>> From 525aff909aec50d4e1a49f289ff9069300a4b51f Mon Sep 17 00:00:00 2001
>> From: Carl Eugen Hoyos <cehoyos at ag.or.at>
>> Date: Sun, 12 Feb 2017 16:41:21 +0100
>> Subject: [PATCH] ffmpeg: Check the return value of two functions declared
>>  "warn_unused_result".
>>
>> ---
>>  ffmpeg.c |   20 ++++++++++++++------
>>  1 file changed, 14 insertions(+), 6 deletions(-)
>>
>> diff --git a/ffmpeg.c b/ffmpeg.c
>> index 06570c0..9952da6 100644
>> --- a/ffmpeg.c
>> +++ b/ffmpeg.c
>> @@ -215,14 +215,18 @@ static void sub2video_copy_rect(uint8_t *dst, int dst_linesize, int w, int h,
>>  static void sub2video_push_ref(InputStream *ist, int64_t pts)
>>  {
>>      AVFrame *frame = ist->sub2video.frame;
>> -    int i;
>> +    int i, ret;
>>
>>      av_assert1(frame->data[0]);
>>      ist->sub2video.last_pts = frame->pts = pts;
>> -    for (i = 0; i < ist->nb_filters; i++)
>> -        av_buffersrc_add_frame_flags(ist->filters[i]->filter, frame,
>> +    for (i = 0; i < ist->nb_filters; i++) {
>
>> +        ret = av_buffersrc_add_frame_flags(ist->filters[i]->filter, frame,
>>                                       AV_BUFFERSRC_FLAG_KEEP_REF |
>>                                       AV_BUFFERSRC_FLAG_PUSH);
>
> When the changes are that small, I think it is better to fix the
> indentation at the same time rather than leave it like that or fix it in
> a separate commit.

Done.

>> +        if (ret < 0)
>> +            av_log(ist->filters[i]->filter, AV_LOG_ERROR,
>
>> +                   "Failed to add a frame to the buffer source.\n");
>
> Please mention it is a "subtitle video frame" and include the error
> message itself (av_err2str(ret)).

Thank you, done twice.

New patch attached, Carl Eugen
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-ffmpeg-Check-the-return-value-of-two-functions-decla.patch
Type: text/x-patch
Size: 2287 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20170212/bc37965c/attachment.bin>