diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 00:11:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 00:11:33 +0100 |
| commit | cc4a6435638fa2a471fef048a3e68eaf7e6e306c (patch) | |
| tree | 074304931d2c5f76d97868399a5b46214fe915ce /libavcodec/c93.c | |
| parent | 29c83d23e8edf47ce423f85d4a2f2081a674a940 (diff) | |
| parent | 6139f481ac9feb1bee4e7d04789fb15d7f24ebbf (diff) | |
| download | ffmpeg-cc4a6435638fa2a471fef048a3e68eaf7e6e306c.tar.gz | |
Merge commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf'
* commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf':
asvenc: use the AVFrame API properly.
a64multienc: use the AVFrame API properly.
Conflicts:
libavcodec/vaapi_mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/c93.c')
0 files changed, 0 insertions, 0 deletions