[FFmpeg-cvslog] h264dec: do not return a value from init_dimensions()

Anton Khirnov git at videolan.org
Mon Mar 16 10:36:11 EET 2020


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Apr 17 10:40:55 2017 +0200| [e38b8b0dc6eb1011ec814bcadf5ece015eb250eb] | committer: Anton Khirnov

h264dec: do not return a value from init_dimensions()

There are no failure cases left in this function.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e38b8b0dc6eb1011ec814bcadf5ece015eb250eb
---

 libavcodec/h264_slice.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 652d2a1f14..34f659b299 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -864,7 +864,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback)
 }
 
 /* export coded and cropped frame dimensions to AVCodecContext */
-static int init_dimensions(H264Context *h)
+static void init_dimensions(H264Context *h)
 {
     const SPS *sps = (const SPS*)h->ps.sps;
     int cr = sps->crop_right;
@@ -902,8 +902,6 @@ static int init_dimensions(H264Context *h)
     h->crop_left           = cl;
     h->crop_top            = ct;
     h->crop_bottom         = cb;
-
-    return 0;
 }
 
 static int h264_slice_header_init(H264Context *h)
@@ -1068,9 +1066,7 @@ static int h264_init_ps(H264Context *h, const H264SliceContext *sl, int first_sl
         h->width  = 16 * h->mb_width;
         h->height = 16 * h->mb_height;
 
-        ret = init_dimensions(h);
-        if (ret < 0)
-            return ret;
+        init_dimensions(h);
 
         if (sps->video_signal_type_present_flag) {
             h->avctx->color_range = sps->full_range > 0 ? AVCOL_RANGE_JPEG



More information about the ffmpeg-cvslog mailing list