diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:10:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:10:56 +0100 |
| commit | 275cd55a0f4b0d11aa35c1dcde9c8b356f8b418f (patch) | |
| tree | aa28cbcc2baf994eebec10cdbf572d59cb1736b3 /README.md | |
| parent | 749fadaa651e21540f3c86561be9be9f098ddb44 (diff) | |
| parent | 556a5090f2b0a20fd9998e1a327875f5b0c8d1d5 (diff) | |
| download | ffmpeg-275cd55a0f4b0d11aa35c1dcde9c8b356f8b418f.tar.gz | |
Merge commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5' into release/2.4
* commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5':
mp3dec: fix reading the Xing tag
Conflicts:
libavformat/mp3dec.c
See: 19ff479f694ddccc1fd1fa00eff94f96ca82671b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions