diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 12:33:27 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 12:33:27 +0100 |
commit | a0c0629dd963b00f989172f0c599353b6b288c37 (patch) | |
tree | 9948f38dd870d440db9ac10f98bbf1275282b056 /libavcodec/mpegvideo_enc.c | |
parent | 5b0c70c2499e20529d517b712910d6f4f72e9485 (diff) | |
parent | 97168b204a0b6b79bb6c5f0d40efdf7fc2262476 (diff) | |
download | ffmpeg-a0c0629dd963b00f989172f0c599353b6b288c37.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>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
0 files changed, 0 insertions, 0 deletions