Commit 13c254a2 authored by Michael Niedermayer's avatar Michael Niedermayer

ffmpeg: random cosmectics to reduce diff to qatar

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 9ce3d03f
...@@ -1914,12 +1914,15 @@ static void do_subtitle_out(AVFormatContext *s, ...@@ -1914,12 +1914,15 @@ static void do_subtitle_out(AVFormatContext *s,
} }
} }
static void do_video_out(AVFormatContext *s, OutputStream *ost, static void do_video_out(AVFormatContext *s,
AVFrame *in_picture, float quality) OutputStream *ost,
AVFrame *in_picture,
float quality)
{ {
int nb_frames, i, ret, format_video_sync; int ret, format_video_sync;
AVPacket pkt; AVPacket pkt;
AVCodecContext *enc; AVCodecContext *enc = ost->st->codec;
int nb_frames, i;
double sync_ipts, delta; double sync_ipts, delta;
double duration = 0; double duration = 0;
int frame_size = 0; int frame_size = 0;
...@@ -1928,8 +1931,6 @@ static void do_video_out(AVFormatContext *s, OutputStream *ost, ...@@ -1928,8 +1931,6 @@ static void do_video_out(AVFormatContext *s, OutputStream *ost,
if (ost->source_index >= 0) if (ost->source_index >= 0)
ist = input_streams[ost->source_index]; ist = input_streams[ost->source_index];
enc = ost->st->codec;
if(ist && ist->st->start_time != AV_NOPTS_VALUE && ist->st->first_dts != AV_NOPTS_VALUE && ost->frame_rate.num) if(ist && ist->st->start_time != AV_NOPTS_VALUE && ist->st->first_dts != AV_NOPTS_VALUE && ost->frame_rate.num)
duration = 1/(av_q2d(ost->frame_rate) * av_q2d(enc->time_base)); duration = 1/(av_q2d(ost->frame_rate) * av_q2d(enc->time_base));
......
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