Merge commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Mar 2013 12:14:16 +0000 (13:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Mar 2013 12:14:16 +0000 (13:14 +0100)
commit795b911bd8acaec4b6f7dc1590f63a529c028ac8
treeef7cd0b106ca457cae871497aff89e22b8d7eacb
parent9b9205e760d226a7dfa1c7ba8d94694f097c8510
parent613a37eca4c7b8eefceaa3e0231c23ad090ca94f
Merge commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f'

* commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f':
  ape: 3.80-3.92 decoding support
  h264: Remove an unused variable

Conflicts:
libavcodec/apedec.c
libavformat/ape.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/apedec.c
libavformat/ape.c