Merge commit '91d4cfb8127f1de6c4ad173a30fffe584700046d'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 12:01:28 +0000 (14:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 12:02:33 +0000 (14:02 +0200)
commit18a9deedb0b0da2d6675e14ecbb270477b7186b7
tree9c32cd56dbf8731f55b879b79f9fd1a4cf5ff910
parent8f68ef46817f6795ee89b2720a17ea972c3f6639
parent91d4cfb8127f1de6c4ad173a30fffe584700046d
Merge commit '91d4cfb8127f1de6c4ad173a30fffe584700046d'

* commit '91d4cfb8127f1de6c4ad173a30fffe584700046d':
  apedec: do not buffer decoded samples over AVPackets

Conflicts:
libavcodec/apedec.c

See: 77d89a5b160127b5b60ba0310cb999077a22525d
Merged-by: Michael Niedermayer <michaelni@gmx.at>