diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 13:41:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 13:41:01 +0200 |
| commit | cdafcf838cc7f559b67863183ad1283c97a9ae70 (patch) | |
| tree | 570f24e0159efb7c525c0237b8d6d23ccd38537c /library.mak | |
| parent | ab2989378fc59128b7e372fadceeb376c9e8cae0 (diff) | |
| parent | 8d617b11cfc87b2c6056fee029ac5bc760af874a (diff) | |
| download | ffmpeg-cdafcf838cc7f559b67863183ad1283c97a9ae70.tar.gz | |
Merge commit '8d617b11cfc87b2c6056fee029ac5bc760af874a'
* commit '8d617b11cfc87b2c6056fee029ac5bc760af874a':
id3v2: pad the APIC packets as required by lavc.
dfa: check for invalid access in decode_wdlt().
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'library.mak')
0 files changed, 0 insertions, 0 deletions