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>

diff --cc doc/ffmpeg.texi
index 1244cc4e031a26536f6f3587e50a00114adc8e85,0c17eb9c72c0a04334b385c60e1b1c05631f384e..c0a81c811aafe7031ed1a4c17f7345d4bdb3c3da
--- 1/doc/ffmpeg.texi
--- 2/doc/avconv.texi
+++ b/doc/ffmpeg.texi
@@@ -1036,29 -815,20 +1036,29 @@@ Set bitstream filters for matching stre
  a comma-separated list of bitstream filters. Use the @code{-bsfs} option
  to get the list of bitstream filters.
  @example
 -avconv -i h264.mp4 -c:v copy -bsf:v h264_mp4toannexb -an out.h264
 +ffmpeg -i h264.mp4 -c:v copy -bsf:v h264_mp4toannexb -an out.h264
  @end example
  @example
 -avconv -i file.mov -an -vn -bsf:s mov2textsub -c:s copy -f rawvideo sub.txt
 +ffmpeg -i file.mov -an -vn -bsf:s mov2textsub -c:s copy -f rawvideo sub.txt
  @end example
  
- @item -tag[:@var{stream_specifier}] @var{codec_tag} (@emph{per-stream})
+ @item -tag[:@var{stream_specifier}] @var{codec_tag} (@emph{input/output,per-stream})
  Force a tag/fourcc for matching streams.
  
 +@item -timecode @var{hh}:@var{mm}:@var{ss}SEP@var{ff}
 +Specify Timecode for writing. @var{SEP} is ':' for non drop timecode and ';'
 +(or '.') for drop.
 +@example
 +ffmpeg -i input.mpg -timecode 01:02:03.04 -r 30000/1001 -s ntsc output.mpg
 +@end example
 +
 +@anchor{filter_complex_option}
  @item -filter_complex @var{filtergraph} (@emph{global})
 -Define a complex filter graph, i.e. one with arbitrary number of inputs and/or
 +Define a complex filtergraph, i.e. one with arbitrary number of inputs and/or
  outputs. For simple graphs -- those with one input and one output of the same
  type -- see the @option{-filter} options. @var{filtergraph} is a description of
 -the filter graph, as described in @ref{Filtergraph syntax}.
 +the filtergraph, as described in the ``Filtergraph syntax'' section of the
 +ffmpeg-filters manual.
  
  Input link labels must refer to input streams using the
  @code{[file_index:stream_specifier]} syntax (i.e. the same as @option{-map}

diff --cc ffmpeg_opt.c
Simple merge