aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg_opt.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-08 23:43:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-08 23:55:06 +0200
commit33ff943f70f04035942a68c725f6cf3426df0677 (patch)
treee71c90d85ca1e32335ed01345d8c4e03854c5ca2 /ffmpeg_opt.c
parent410905f7fd0d7f3274f3260aa508dc50e174105b (diff)
downloadandroid_external_ffmpeg-33ff943f70f04035942a68c725f6cf3426df0677.tar.gz
android_external_ffmpeg-33ff943f70f04035942a68c725f6cf3426df0677.tar.bz2
android_external_ffmpeg-33ff943f70f04035942a68c725f6cf3426df0677.zip
ffmpeg: add -apad option which injects a apad filter only in the presence of video streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
-rw-r--r--ffmpeg_opt.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index c87bf01100..2aff60179c 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -1334,6 +1334,9 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc, in
MATCH_PER_STREAM_OPT(audio_sample_rate, i, audio_enc->sample_rate, oc, st);
+ MATCH_PER_STREAM_OPT(apad, str, ost->apad, oc, st);
+ ost->apad = av_strdup(ost->apad);
+
ost->avfilter = get_ost_filters(o, oc, ost);
if (!ost->avfilter)
exit(1);
@@ -2642,6 +2645,9 @@ const OptionDef options[] = {
{ "shortest", OPT_BOOL | OPT_EXPERT | OPT_OFFSET |
OPT_OUTPUT, { .off = OFFSET(shortest) },
"finish encoding within shortest input" },
+ { "apad", OPT_STRING | HAS_ARG | OPT_SPEC |
+ OPT_OUTPUT, { .off = OFFSET(apad) },
+ "audio pad", "" },
{ "dts_delta_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, { &dts_delta_threshold },
"timestamp discontinuity delta threshold", "threshold" },
{ "dts_error_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, { &dts_error_threshold },