Merge commit '379e5603f4131e677ecf5ba79973dcd5603f28ea'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 May 2015 20:50:22 +0000 (22:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 May 2015 20:51:38 +0000 (22:51 +0200)
commit1cf81a2c509ebb0421ea6d0745eb3dbc99ac6f4c
tree93532917ea6c4ee966a758f6837ddeefe410ff98
parentf230451b7a6949af297259de78a480166d43fddd
parent379e5603f4131e677ecf5ba79973dcd5603f28ea
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>
libavformat/id3v2.c