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 /libavutil | |
| 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 'libavutil')
0 files changed, 0 insertions, 0 deletions