[FFmpeg-cvslog] Merge commit 'c3ebfcd6e1327ca7bbcaee822e593c2da6cfd352'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 20 11:57:22 2013 +0100| [f7fee8f700c27273fd0398d89c00ff7725bbf3fa] | committer: Michael Niedermayer

Merge commit 'c3ebfcd6e1327ca7bbcaee822e593c2da6cfd352'

* commit 'c3ebfcd6e1327ca7bbcaee822e593c2da6cfd352':
  mpegvideo: allocate hwaccel privdata after the frame buffer
  h264: allocate hwaccel privdata after the frame buffer

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

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