[FFmpeg-cvslog] Merge commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 12 00:06:35 2014 +0200| [c4fe50b954a0490c54efca19682cfae00eba3145] | committer: Michael Niedermayer

Merge commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436'

* commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436':
  hwaccel: Support specific frame allocators

Conflicts:
	libavcodec/utils.c

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

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