From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 11 Dec 2013 22:55:47 +0000 (+0100)
Subject: Merge commit 'b06c8bce02b15115a4789252365df2dda0c4713c'
X-Git-Tag: android-x86-6.0-r1~8377
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=efb5ebe83258ad4b4f610c93b690c63da2fb57a3;p=android-x86%2Fexternal-ffmpeg.git

Merge commit 'b06c8bce02b15115a4789252365df2dda0c4713c'

* commit 'b06c8bce02b15115a4789252365df2dda0c4713c':
  mpegvideo: remove an unneeded call to avcodec_get_frame_defaults().

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

efb5ebe83258ad4b4f610c93b690c63da2fb57a3