diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-02 22:39:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-02 22:39:00 +0200 |
| commit | f5b26fbc2f564831b337f1de9faaaf6753a03871 (patch) | |
| tree | d6983d185fdc2a2df77795a739493c0569872e2c /ffmpeg_opt.c | |
| parent | deedf3e590027e53cf999b11a25fc9be9615b5f2 (diff) | |
| parent | 16302246b1fcb7ad4e6f7bd31c49956a455336d2 (diff) | |
| download | ffmpeg-streaming-f5b26fbc2f564831b337f1de9faaaf6753a03871.zip ffmpeg-streaming-f5b26fbc2f564831b337f1de9faaaf6753a03871.tar.gz | |
Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'
* commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2':
avconv: Add an option for automatically rotating video according to display matrix
Conflicts:
Changelog
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 75c80e7..f59b93b 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -602,6 +602,9 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) ist->ts_scale = 1.0; MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st); + ist->autorotate = 1; + MATCH_PER_STREAM_OPT(autorotate, i, ist->autorotate, ic, st); + MATCH_PER_STREAM_OPT(codec_tags, str, codec_tag, ic, st); if (codec_tag) { uint32_t tag = strtol(codec_tag, &next, 0); @@ -3069,6 +3072,9 @@ const OptionDef options[] = { #if HAVE_VDPAU_X11 { "vdpau_api_ver", HAS_ARG | OPT_INT | OPT_EXPERT, { &vdpau_api_ver }, "" }, #endif + { "autorotate", HAS_ARG | OPT_BOOL | OPT_SPEC | + OPT_EXPERT | OPT_INPUT, { .off = OFFSET(autorotate) }, + "automatically insert correct rotate filters" }, /* audio options */ { "aframes", OPT_AUDIO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_audio_frames }, |
