[FFmpeg-cvslog] Merge commit '05de372350f8720461d3cadba40836546f1bb95c' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May  4 22:36:26 2014 +0200| [b9be91c03d274be5fa3fcd860ba37bb2fbeca429] | committer: Michael Niedermayer

Merge commit '05de372350f8720461d3cadba40836546f1bb95c' into release/1.1

* commit '05de372350f8720461d3cadba40836546f1bb95c':
  apedec: do not buffer decoded samples over AVPackets

Conflicts:
	libavcodec/apedec.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9be91c03d274be5fa3fcd860ba37bb2fbeca429
---