Commit 7a38987f authored by Michael Niedermayer's avatar Michael Niedermayer Committed by Vittorio Giovara

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

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent c45eeb2d
...@@ -1356,7 +1356,7 @@ av_cold int ff_mpv_common_init(MpegEncContext *s) ...@@ -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) ...@@ -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) ...@@ -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++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment