diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 15:56:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 15:56:20 +0200 |
| commit | 608d86013a8663ef5f2fc8c74998750ed2019149 (patch) | |
| tree | f46ec16c3756c6775c64cfd53fc821f1fc21143b /COPYING.GPLv2 | |
| parent | 3dedcef8b889c07f700f6f5d5632a120eb46f593 (diff) | |
| parent | e19e8aeeaaff3d4bc8f6065764c93f0298782ac6 (diff) | |
| download | ffmpeg-608d86013a8663ef5f2fc8c74998750ed2019149.tar.gz | |
Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6'
* commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6':
avtools: move media_type_string() from avprobe to cmdutils.
Conflicts:
avprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv2')
0 files changed, 0 insertions, 0 deletions