diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 12:49:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 12:49:53 +0200 |
| commit | 899d3706d8fde29b78d0a72f92cfcd8be6aab419 (patch) | |
| tree | db59a9fd83b3937b41678643f7a27382549a4b7a /libavcodec/libcelt_dec.c | |
| parent | 2c5ae57776907142b78243cbf502be6f5370ca87 (diff) | |
| parent | 99143140dea12363af680d02e23cb42cfe191679 (diff) | |
| download | ffmpeg-899d3706d8fde29b78d0a72f92cfcd8be6aab419.tar.gz | |
Merge commit '99143140dea12363af680d02e23cb42cfe191679'
* commit '99143140dea12363af680d02e23cb42cfe191679':
mp3dec: fix reading the Xing tag
Conflicts:
libavformat/mp3dec.c
See: 19ff479f694ddccc1fd1fa00eff94f96ca82671b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libcelt_dec.c')
0 files changed, 0 insertions, 0 deletions