[FFmpeg-cvslog] avcodec/mpegvideo: free_context_frame() cannot fail, make it return void
Michael Niedermayer
git at videolan.org
Sun Sep 7 13:32:41 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep 7 12:51:08 2014 +0200| [94c61cd9aede4c0b57632d524a725c2dda719eb3] | committer: Michael Niedermayer
avcodec/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=94c61cd9aede4c0b57632d524a725c2dda719eb3
---
libavcodec/mpegvideo.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 41a8799..3d00024 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++) {
More information about the ffmpeg-cvslog
mailing list