diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 21:00:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 21:13:01 +0200 |
| commit | 0b0d47e4b21e8936707183967d840f64ba055cb2 (patch) | |
| tree | 2fc966ace26f75749fe80a14941acf9b71d4bebe /libavcodec/mpegaudioenc_template.c | |
| parent | 45fed258ee6a58ca7e12a94936fa24b742d48f69 (diff) | |
| parent | bae557edcea996328e8ff48b9e074a4210f7e6b4 (diff) | |
| download | ffmpeg-0b0d47e4b21e8936707183967d840f64ba055cb2.tar.gz | |
Merge commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4'
* commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4':
dump: display codec tags when available
Conflicts:
libavcodec/utils.c
See: d2d7b7134fc387837d51aa1d7f3dbe090d35e8b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudioenc_template.c')
0 files changed, 0 insertions, 0 deletions