diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 08:53:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 09:15:46 +0100 |
| commit | cc6cc84bc4e009b08ae2f4c2206920e2963adc52 (patch) | |
| tree | 9f366c0070ff5a9900e233f131a8b0b3ed35bcae /ffmpeg_opt.c | |
| parent | 3f3d748cab3805dcc48599a8747976e18da3ab68 (diff) | |
| parent | 746dca483a2f0f2639265f6e1c0085c8861875a1 (diff) | |
| download | ffmpeg-cc6cc84bc4e009b08ae2f4c2206920e2963adc52.tar.gz | |
Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'
* commit '746dca483a2f0f2639265f6e1c0085c8861875a1':
avconv: support forcing codec tags for input streams
Conflicts:
doc/ffmpeg.texi
See: 6bca574a98ba604459f6ee92538b19d25bba0973
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 5db961a1fa..7b4630fb25 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -559,13 +559,14 @@ static AVCodec *choose_decoder(OptionsContext *o, AVFormatContext *s, AVStream * static void add_input_streams(OptionsContext *o, AVFormatContext *ic) { int i; - char *next, *codec_tag = NULL; for (i = 0; i < ic->nb_streams; i++) { AVStream *st = ic->streams[i]; AVCodecContext *dec = st->codec; InputStream *ist = av_mallocz(sizeof(*ist)); char *framerate = NULL, *hwaccel = NULL, *hwaccel_device = NULL; + char *codec_tag = NULL; + char *next; if (!ist) exit_program(1); @@ -2780,7 +2781,7 @@ const OptionDef options[] = { { "frames", OPT_INT64 | HAS_ARG | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(max_frames) }, "set the number of frames to record", "number" }, { "tag", OPT_STRING | HAS_ARG | OPT_SPEC | - OPT_EXPERT | OPT_OUTPUT, { .off = OFFSET(codec_tags) }, + OPT_EXPERT | OPT_OUTPUT | OPT_INPUT, { .off = OFFSET(codec_tags) }, "force codec tag/fourcc", "fourcc/tag" }, { "q", HAS_ARG | OPT_EXPERT | OPT_DOUBLE | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(qscale) }, |