diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 12:17:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 03:32:38 +0100 |
| commit | 6133f450bb816db578c5253de9e072078fdf8edc (patch) | |
| tree | 0c6e21083d480c76937e3e4ba4c0823d176c3670 /libavcodec/vdpau.h | |
| parent | 8a9f4f8800c1cd35ec9e0d6b9a74db2834c94875 (diff) | |
| download | ffmpeg-6133f450bb816db578c5253de9e072078fdf8edc.tar.gz | |
Merge commit '57e7b3a89f5a0879ad039e8f04273b48649799a8'
* commit '57e7b3a89f5a0879ad039e8f04273b48649799a8':
dnxhdenc: use the AVFrame API properly.
libx264: use the AVFrame API properly.
svq1enc: use the AVFrame API properly.
gif: use the AVFrame API properly.
Conflicts:
libavcodec/gif.c
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5b0c70c2499e20529d517b712910d6f4f72e9485)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau.h')
0 files changed, 0 insertions, 0 deletions