diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 12:33:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 03:32:43 +0100 |
| commit | 4d373ee8e4c9db7e5d3bcdb35457211bddf2fbff (patch) | |
| tree | 16f237cd97200ff33d8682e966ed5ecc8bc8c3d1 /libavcodec/pcxenc.c | |
| parent | 6133f450bb816db578c5253de9e072078fdf8edc (diff) | |
| download | ffmpeg-4d373ee8e4c9db7e5d3bcdb35457211bddf2fbff.tar.gz | |
Merge commit '97168b204a0b6b79bb6c5f0d40efdf7fc2262476'
* commit '97168b204a0b6b79bb6c5f0d40efdf7fc2262476':
eatgv: use the AVFrame API properly.
libxavs: use the AVFrame API properly.
nuv: use the AVFrame API properly.
flashsvenc: use the AVFrame API properly.
Conflicts:
libavcodec/eatgv.c
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a0c0629dd963b00f989172f0c599353b6b288c37)
Conflicts:
libavcodec/eatgv.c
Author of the merged code: Anton Khirnov
Diffstat (limited to 'libavcodec/pcxenc.c')
0 files changed, 0 insertions, 0 deletions