diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-07 12:51:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-07 13:26:22 +0200 |
| commit | 94c61cd9aede4c0b57632d524a725c2dda719eb3 (patch) | |
| tree | e5e628a821e544e03e9c7e576f1efe628b5da531 /libavcodec/mpegvideo.c | |
| parent | de1f0c94cdcb6dbc7dc5b42e2cffc09d2a0433e1 (diff) | |
| download | ffmpeg-94c61cd9aede4c0b57632d524a725c2dda719eb3.tar.gz | |
avcodec/mpegvideo: free_context_frame() cannot fail, make it return void
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 41a879915d..3d0002460a 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -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++) { |