From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 17 Nov 2013 00:16:26 +0000 (+0100)
Subject: Merge commit 'b7462a3904d71ff799584faf5b875cad59ca2f31'
X-Git-Tag: android-x86-6.0-r1~8959
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ddfdcd2b5ecce0914c1eefa6269060bdbc879b17;p=android-x86%2Fexternal-ffmpeg.git

Merge commit 'b7462a3904d71ff799584faf5b875cad59ca2f31'

* commit 'b7462a3904d71ff799584faf5b875cad59ca2f31':
  jvdec: use the AVFrame API properly.

Conflicts:
	libavcodec/jvdec.c

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

ddfdcd2b5ecce0914c1eefa6269060bdbc879b17