generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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-11-24 17:05:03 +00:00 committed by Vittorio Giovara
parent c45eeb2dbf
commit 7a38987f24
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

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