From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 20 Mar 2013 10:57:22 +0000 (+0100)
Subject: Merge commit 'c3ebfcd6e1327ca7bbcaee822e593c2da6cfd352'
X-Git-Tag: android-x86-4.4-r1~4926
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f7fee8f700c27273fd0398d89c00ff7725bbf3fa;p=android-x86%2Fexternal-ffmpeg.git

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>
---

f7fee8f700c27273fd0398d89c00ff7725bbf3fa