Commit 18a9deed authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '91d4cfb8'

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

Conflicts:
	libavcodec/apedec.c

See: 77d89a5bMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8f68ef46 91d4cfb8
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment