Skip to content

F
ffmpeg.wasm-core
Commit e38b8b0d authored by Anton Khirnov's avatar Anton Khirnov
Browse files
Options

h264dec: do not return a value from init_dimensions() 

There are no failure cases left in this function.
parent 1b17988c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
libavcodec/h264_slice.c
View file @ e38b8b0d
...@@ -864,7 +864,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) ...@@ -864,7 +864,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback)
} }
/* export coded and cropped frame dimensions to AVCodecContext */ /* 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; const SPS *sps = (const SPS*)h->ps.sps;
int cr = sps->crop_right; int cr = sps->crop_right;
...@@ -902,8 +902,6 @@ static int init_dimensions(H264Context *h) ...@@ -902,8 +902,6 @@ static int init_dimensions(H264Context *h)
h->crop_left = cl; h->crop_left = cl;
h->crop_top = ct; h->crop_top = ct;
h->crop_bottom = cb; h->crop_bottom = cb;
return 0;
} }
static int h264_slice_header_init(H264Context *h) 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 ...@@ -1068,9 +1066,7 @@ static int h264_init_ps(H264Context *h, const H264SliceContext *sl, int first_sl
h->width = 16 * h->mb_width; h->width = 16 * h->mb_width;
h->height = 16 * h->mb_height; h->height = 16 * h->mb_height;
ret = init_dimensions(h); init_dimensions(h);
if (ret < 0)
return ret;
if (sps->video_signal_type_present_flag) { if (sps->video_signal_type_present_flag) {
h->avctx->color_range = sps->full_range > 0 ? AVCOL_RANGE_JPEG h->avctx->color_range = sps->full_range > 0 ? AVCOL_RANGE_JPEG
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment