[FFmpeg-cvslog] mpegvideo: free_context_frame() cannot fail, make it return void
Michael Niedermayer
git at videolan.org
Fri Dec 5 23:15:50 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 24 17:05:03 2014 +0000| [7a38987f245e3c280d81442f207b983333b6233c] | committer: Vittorio Giovara
mpegvideo: free_context_frame() cannot fail, make it return void
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a38987f245e3c280d81442f207b983333b6233c
---
libavcodec/mpegvideo.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 2a46a68..868f715 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++) {
More information about the ffmpeg-cvslog
mailing list