Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2017-04-17 11:40:55 +0300
committerAnton Khirnov <anton@khirnov.net>2020-03-16 11:27:48 +0300
commite38b8b0dc6eb1011ec814bcadf5ece015eb250eb (patch)
treea12ba8d19df4176ede6946213391744b212f5ac0 /libavcodec/h264_slice.c
parent1b17988cb55297f152ca1701555c4ecf2005014a (diff)
h264dec: do not return a value from init_dimensions()
There are no failure cases left in this function.
Diffstat (limited to 'libavcodec/h264_slice.c')
-rw-r--r--libavcodec/h264_slice.c8
1 files 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