diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 01:16:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 03:31:29 +0100 |
| commit | 2fe67ddb243e16788f32c5e18abd48315ba1b8de (patch) | |
| tree | 03d54d3103037579dc586a1979d38759f46837c8 /ffmpeg_opt.c | |
| parent | b7cb77a3228f19e9550f7cb917dc270a553a4fd1 (diff) | |
| download | ffmpeg-2fe67ddb243e16788f32c5e18abd48315ba1b8de.tar.gz | |
Merge commit 'b7462a3904d71ff799584faf5b875cad59ca2f31'
* commit 'b7462a3904d71ff799584faf5b875cad59ca2f31':
jvdec: use the AVFrame API properly.
Conflicts:
libavcodec/jvdec.c
See: 678431d3f2c5f35fe48b02d5035604ace742be2e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ddfdcd2b5ecce0914c1eefa6269060bdbc879b17)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions