* commit '746dca483a2f0f2639265f6e1c0085c8861875a1': avconv: support forcing codec tags for input streams Conflicts: doc/ffmpeg.texi
Unified · Split
| @@ -1042,7 +1042,7 @@ ffmpeg -i h264.mp4 -c:v copy -bsf:v h264_mp4toannexb -an out.h264 · 1041 unmodified lines | |||
| 1042 | ffmpeg -i file.mov -an -vn -bsf:s mov2textsub -c:s copy -f rawvideo sub.txt | 1042 | ffmpeg -i file.mov -an -vn -bsf:s mov2textsub -c:s copy -f rawvideo sub.txt |
| 1043 | @end example | 1043 | @end example |
| 1044 | 1044 | ||
| 1045 | @item -tag[:@var{stream_specifier}] @var{codec_tag} (@emph{per-stream}) | 1045 | @item -tag[:@var{stream_specifier}] @var{codec_tag} (@emph{input/output,per-stream}) |
| 1046 | Force a tag/fourcc for matching streams. | 1046 | Force a tag/fourcc for matching streams. |
| 1047 | 1047 | ||
| 1048 | @item -timecode @var{hh}:@var{mm}:@var{ss}SEP@var{ff} | 1048 | @item -timecode @var{hh}:@var{mm}:@var{ss}SEP@var{ff} |
| @@ -559,13 +559,14 @@ static AVCodec *choose_decoder(OptionsContext *o, AVFormatContext *s, AVStream * · 558 unmodified lines | |||
| 559 | static void add_input_streams(OptionsContext *o, AVFormatContext *ic) | 559 | static void add_input_streams(OptionsContext *o, AVFormatContext *ic) |
| 560 | { | 560 | { |
| 561 | int i; | 561 | int i; |
| 562 | char *next, *codec_tag = NULL; | ||
| 563 | 562 | ||
| 564 | for (i = 0; i < ic->nb_streams; i++) { | 563 | for (i = 0; i < ic->nb_streams; i++) { |
| 565 | AVStream *st = ic->streams[i]; | 564 | AVStream *st = ic->streams[i]; |
| 566 | AVCodecContext *dec = st->codec; | 565 | AVCodecContext *dec = st->codec; |
| 567 | InputStream *ist = av_mallocz(sizeof(*ist)); | 566 | InputStream *ist = av_mallocz(sizeof(*ist)); |
| 568 | char *framerate = NULL, *hwaccel = NULL, *hwaccel_device = NULL; | 567 | char *framerate = NULL, *hwaccel = NULL, *hwaccel_device = NULL; |
| 568 | char *codec_tag = NULL; | ||
| 569 | char *next; | ||
| 569 | 570 | ||
| 570 | if (!ist) | 571 | if (!ist) |
| 571 | exit_program(1); | 572 | exit_program(1); |
| @@ -2780,7 +2781,7 @@ const OptionDef options[] = { · 2208 unmodified lines | |||
| 2780 | { "frames", OPT_INT64 | HAS_ARG | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(max_frames) }, | 2781 | { "frames", OPT_INT64 | HAS_ARG | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(max_frames) }, |
| 2781 | "set the number of frames to record", "number" }, | 2782 | "set the number of frames to record", "number" }, |
| 2782 | { "tag", OPT_STRING | HAS_ARG | OPT_SPEC | | 2783 | { "tag", OPT_STRING | HAS_ARG | OPT_SPEC | |
| 2783 | OPT_EXPERT | OPT_OUTPUT, { .off = OFFSET(codec_tags) }, | 2784 | OPT_EXPERT | OPT_OUTPUT | OPT_INPUT, { .off = OFFSET(codec_tags) }, |
| 2784 | "force codec tag/fourcc", "fourcc/tag" }, | 2785 | "force codec tag/fourcc", "fourcc/tag" }, |
| 2785 | { "q", HAS_ARG | OPT_EXPERT | OPT_DOUBLE | | 2786 | { "q", HAS_ARG | OPT_EXPERT | OPT_DOUBLE | |
| 2786 | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(qscale) }, | 2787 | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(qscale) }, |