mirror of https://git.ffmpeg.org/ffmpeg.git
avcodec/mpeg12enc: Reindent after the previous commit
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
d3a2d06633
commit
5256658af5
|
@ -263,7 +263,7 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s)
|
|||
{
|
||||
MPEG12EncContext *const mpeg12 = (MPEG12EncContext*)s;
|
||||
unsigned int vbv_buffer_size, fps, v;
|
||||
int i, constraint_parameter_flag;
|
||||
int constraint_parameter_flag;
|
||||
AVRational framerate = ff_mpeg12_frame_rate_tab[s->frame_rate_index];
|
||||
uint64_t time_code;
|
||||
int64_t best_aspect_error = INT64_MAX;
|
||||
|
@ -276,14 +276,13 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s)
|
|||
if (aspect_ratio.num == 0 || aspect_ratio.den == 0)
|
||||
aspect_ratio = (AVRational){1,1}; // pixel aspect 1.1 (VGA)
|
||||
|
||||
|
||||
/* MPEG-1 header repeated every GOP */
|
||||
put_header(s, SEQ_START_CODE);
|
||||
|
||||
put_sbits(&s->pb, 12, s->width & 0xFFF);
|
||||
put_sbits(&s->pb, 12, s->height & 0xFFF);
|
||||
|
||||
for (i = 1; i < 15; i++) {
|
||||
for (int i = 1; i < 15; i++) {
|
||||
int64_t error = aspect_ratio.num * (1LL<<32) / aspect_ratio.den;
|
||||
if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO || i <= 1)
|
||||
error -= (1LL<<32) / ff_mpeg1_aspect[i];
|
||||
|
@ -339,7 +338,7 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s)
|
|||
ff_write_quant_matrix(&s->pb, s->avctx->inter_matrix);
|
||||
|
||||
if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
|
||||
AVFrameSideData *side_data;
|
||||
const AVFrameSideData *side_data;
|
||||
int width = s->width;
|
||||
int height = s->height;
|
||||
int use_seq_disp_ext;
|
||||
|
@ -365,7 +364,7 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s)
|
|||
|
||||
side_data = av_frame_get_side_data(s->current_picture_ptr->f, AV_FRAME_DATA_PANSCAN);
|
||||
if (side_data) {
|
||||
AVPanScan *pan_scan = (AVPanScan *)side_data->data;
|
||||
const AVPanScan *pan_scan = (AVPanScan *)side_data->data;
|
||||
if (pan_scan->width && pan_scan->height) {
|
||||
width = pan_scan->width >> 4;
|
||||
height = pan_scan->height >> 4;
|
||||
|
|
Loading…
Reference in New Issue