diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 22:50:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 22:51:38 +0200 |
| commit | 1cf81a2c509ebb0421ea6d0745eb3dbc99ac6f4c (patch) | |
| tree | 93532917ea6c4ee966a758f6837ddeefe410ff98 /tests/ref/vsynth/vsynth_lena-mpeg4-thread | |
| parent | f230451b7a6949af297259de78a480166d43fddd (diff) | |
| parent | 379e5603f4131e677ecf5ba79973dcd5603f28ea (diff) | |
| download | ffmpeg-1cf81a2c509ebb0421ea6d0745eb3dbc99ac6f4c.tar.gz | |
Merge commit '379e5603f4131e677ecf5ba79973dcd5603f28ea'
* commit '379e5603f4131e677ecf5ba79973dcd5603f28ea':
id3v2: Do not export empty APIC description
Conflicts:
libavformat/id3v2.c
See: b697b297b77f73c932307120e32c187d521d2ff7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/vsynth/vsynth_lena-mpeg4-thread')
0 files changed, 0 insertions, 0 deletions