aboutsummaryrefslogtreecommitdiffstats
path: root/avconv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-04-10 15:02:01 +0200
committerAnton Khirnov <anton@khirnov.net>2013-04-30 11:53:12 +0200
commita83c0da539fb07260310bc3b34056239d2b138b2 (patch)
tree39b62e964b8486cb16731f1e255a94371e851873 /avconv.c
parent3d624420086ed3cd0c74f4510f0285968e21c117 (diff)
downloadffmpeg-a83c0da539fb07260310bc3b34056239d2b138b2.tar.gz
avconv: make -t insert trim/atrim filters.
This makes -t sample-accurate for audio and will allow further simplication in the future. Most of the FATE changes are due to audio now being sample accurate. In some cases a video frame was incorrectly passed with the old code, while its was over the limit.
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/avconv.c b/avconv.c
index 658dadc093..3b50f20cbb 100644
--- a/avconv.c
+++ b/avconv.c
@@ -380,9 +380,6 @@ static void do_audio_out(AVFormatContext *s, OutputStream *ost,
pkt.data = NULL;
pkt.size = 0;
- if (!check_recording_time(ost))
- return;
-
if (frame->pts == AV_NOPTS_VALUE || audio_sync_method < 0)
frame->pts = ost->sync_opts;
ost->sync_opts = frame->pts + frame->nb_samples;
@@ -549,8 +546,7 @@ static void do_video_out(AVFormatContext *s,
pkt.data = NULL;
pkt.size = 0;
- if (!check_recording_time(ost) ||
- ost->frame_number >= ost->max_frames)
+ if (ost->frame_number >= ost->max_frames)
return;
if (s->oformat->flags & AVFMT_RAWPICTURE &&