virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/mpegvideo: free_context_frame() cannot fail, make it return void

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-07 12:51:08 +02:00
parent de1f0c94cd
commit 94c61cd9ae
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/mpegvideo.c
View File

@ -1403,7 +1403,7 @@ av_cold int ff_mpv_common_init(MpegEncContext *s)
* Is used during resolution changes to avoid a full reinitialization of the
* codec.
*/
static int free_context_frame(MpegEncContext *s)
static void free_context_frame(MpegEncContext *s)
{
int i, j, k;
@ -1450,8 +1450,6 @@ static int free_context_frame(MpegEncContext *s)
av_freep(&s->bits_tab);
s->linesize = s->uvlinesize = 0;
return 0;
}
int ff_mpv_common_frame_size_change(MpegEncContext *s)
@ -1468,8 +1466,7 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s)
} else
free_duplicate_context(s);
if ((err = free_context_frame(s)) < 0)
return err;
free_context_frame(s);
if (s->picture)
for (i = 0; i < MAX_PICTURE_COUNT; i++) {