diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 13:27:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 21:23:25 +0100 |
| commit | 345e2a2b43885611f1d44d975235ba0db63b8de8 (patch) | |
| tree | c7caa8cadd71a98a5bb52a5c4a25c9020f33c35a /ffplay.c | |
| parent | 7442aa20fad1fc30c1b079b72d62cf26bee45acd (diff) | |
| download | ffmpeg-345e2a2b43885611f1d44d975235ba0db63b8de8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo_enc: use the AVFrame API properly.
ffv1: use the AVFrame API properly.
jpegls: use the AVFrame API properly.
huffyuv: use the AVFrame API properly.
Conflicts:
libavcodec/ffv1.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
Changes to ffv1 are more redone than merged due to them being based on
an ancient codebase and a good part of that having being done already
as well.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit be1e6e7503b2f10b0176201418eb97912cee093f)
Conflicts:
libavcodec/ffv1enc.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
Author of the merged code: Anton Khirnov
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions