OSDN Git Service

Merge commit 'c3ebfcd6e1327ca7bbcaee822e593c2da6cfd352'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Mar 2013 10:57:22 +0000 (11:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Mar 2013 10:57:28 +0000 (11:57 +0100)
commitf7fee8f700c27273fd0398d89c00ff7725bbf3fa
treeb8fdf15bb84dbbf094b91a82f3a0255aaa99caec
parent084510d12ab6af7ecb516b6fbc03c99c3617d5ce
parentc3ebfcd6e1327ca7bbcaee822e593c2da6cfd352
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@gmx.at>
libavcodec/h264.c
libavcodec/mpegvideo.c