OSDN Git Service

Merge commit 'b7462a3904d71ff799584faf5b875cad59ca2f31'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 00:16:26 +0000 (01:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 00:17:18 +0000 (01:17 +0100)
commitddfdcd2b5ecce0914c1eefa6269060bdbc879b17
treeedeba220904a89bd8249555f6ec880ad382768a1
parent5219afc09d8e97e18917738cbc052f903df9a619
parentb7462a3904d71ff799584faf5b875cad59ca2f31
Merge commit 'b7462a3904d71ff799584faf5b875cad59ca2f31'

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

Conflicts:
libavcodec/jvdec.c

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