aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-20 12:24:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-20 12:24:49 +0200
commit13c254a216497dc4be4b7bc983f9903b3192329f (patch)
treeaf103f0ad9e923fdc05d34344be62c2d6427eb16
parent9ce3d03fc2f0b1addd421ee8e764642c6154b921 (diff)
downloadffmpeg-13c254a216497dc4be4b7bc983f9903b3192329f.tar.gz
ffmpeg: random cosmectics to reduce diff to qatar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffmpeg.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 5c39655cef..b0e3c47fae 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1914,12 +1914,15 @@ static void do_subtitle_out(AVFormatContext *s,
}
}
-static void do_video_out(AVFormatContext *s, OutputStream *ost,
- AVFrame *in_picture, float quality)
+static void do_video_out(AVFormatContext *s,
+ OutputStream *ost,
+ AVFrame *in_picture,
+ float quality)
{
- int nb_frames, i, ret, format_video_sync;
+ int ret, format_video_sync;
AVPacket pkt;
- AVCodecContext *enc;
+ AVCodecContext *enc = ost->st->codec;
+ int nb_frames, i;
double sync_ipts, delta;
double duration = 0;
int frame_size = 0;
@@ -1928,8 +1931,6 @@ static void do_video_out(AVFormatContext *s, OutputStream *ost,
if (ost->source_index >= 0)
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)
duration = 1/(av_q2d(ost->frame_rate) * av_q2d(enc->time_base));