Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 07:53:13 +0000 (08:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 08:15:46 +0000 (09:15 +0100)
commitcc6cc84bc4e009b08ae2f4c2206920e2963adc52
tree9f366c0070ff5a9900e233f131a8b0b3ed35bcae
parent3f3d748cab3805dcc48599a8747976e18da3ab68
parent746dca483a2f0f2639265f6e1c0085c8861875a1
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>
doc/ffmpeg.texi
ffmpeg_opt.c