diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 12:58:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 13:01:40 +0100 |
| commit | eb215be9ce74f90d5aff304ad593f17a313f71fd (patch) | |
| tree | 82004ac1a2c3ab93d6ce57f640611b0bc26cc130 /libavcodec/parser.c | |
| parent | 24c76bae5f47c14ed70e4857eaa3138df566b4cc (diff) | |
| parent | 54bc15d5ebfd07fd468743ba29f709ea19e840b9 (diff) | |
| download | ffmpeg-eb215be9ce74f90d5aff304ad593f17a313f71fd.tar.gz | |
Merge commit '54bc15d5ebfd07fd468743ba29f709ea19e840b9'
* commit '54bc15d5ebfd07fd468743ba29f709ea19e840b9':
id3v2: fix reading v2.2 attached pictures
Conflicts:
libavformat/id3v2.c
See: 05c3c568dccd6c42fdf6eea891d08c71fe2ee772
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/parser.c')
0 files changed, 0 insertions, 0 deletions