diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 03:17:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 03:17:48 +0100 |
| commit | 9ad477d9098b5281cede0bd8525ca90b0e52436d (patch) | |
| tree | 64617e4d79e4bade2130f1b115cab54a61b45315 /ffplay.c | |
| parent | 8d193a24f2da825aaf5382e4aa42ab533806b033 (diff) | |
| parent | e4155f15b35c4272a235f5521d2dc6c2aabdd462 (diff) | |
| download | ffmpeg-9ad477d9098b5281cede0bd8525ca90b0e52436d.tar.gz | |
Merge commit 'e4155f15b35c4272a235f5521d2dc6c2aabdd462'
* commit 'e4155f15b35c4272a235f5521d2dc6c2aabdd462':
eamad: use the AVFrame API properly.
dpxenc: use the AVFrame API properly.
bmpenc: use the AVFrame API properly.
sgienc: use the AVFrame API properly.
Conflicts:
libavcodec/bmpenc.c
libavcodec/dpxenc.c
libavcodec/eamad.c
libavcodec/sgienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions