Merge commit '22a154e4363b351dd9f321003de01dffebd2fa18'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 12:56:14 +0000 (14:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 12:56:22 +0000 (14:56 +0200)
commit7ed002d79136c2e24d12b432852a271b235fc3b9
tree93bb61e9bcc40c407ecaa828bfd2636fffee860a
parent1dfb34db6dd0fcce78a54eb29e09fa5984da6e9a
parent22a154e4363b351dd9f321003de01dffebd2fa18
Merge commit '22a154e4363b351dd9f321003de01dffebd2fa18'

* commit '22a154e4363b351dd9f321003de01dffebd2fa18':
  build: Add missing img2.o dependency to apetag.o

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/Makefile