diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-24 17:05:03 +0000 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-12-03 12:52:04 +0000 |
| commit | 7a38987f245e3c280d81442f207b983333b6233c (patch) | |
| tree | 2ba8e7fd829eeb6ac239ed66a140a9248af681e7 /libavcodec | |
| parent | c45eeb2dbf42382d335da8068231a8026c08843b (diff) | |
| download | ffmpeg-7a38987f245e3c280d81442f207b983333b6233c.tar.gz | |
mpegvideo: free_context_frame() cannot fail, make it return void
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 2a46a684bb..868f715513 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -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 * codec. */ -static int free_context_frame(MpegEncContext *s) +static void free_context_frame(MpegEncContext *s) { int i, j, k; @@ -1402,8 +1402,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) @@ -1420,8 +1418,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++) { |