diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 00:11:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 03:30:57 +0100 |
| commit | 572ccbd299f0aeb3c7f9661752bd111497f08166 (patch) | |
| tree | 4c1704739bdfcbf9b1a43035840b2a1d65790d3a /common.mak | |
| parent | dcf0f82d08e88ea952aa97c16e4e774ce6c2ceb8 (diff) | |
| download | ffmpeg-572ccbd299f0aeb3c7f9661752bd111497f08166.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>
(cherry picked from commit cc4a6435638fa2a471fef048a3e68eaf7e6e306c)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions