|
|
|
@ -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 |
|
|
|
|