Merge commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Nov 2013 23:11:33 +0000 (00:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Jan 2014 02:30:57 +0000 (03:30 +0100)
commit572ccbd299f0aeb3c7f9661752bd111497f08166
tree4c1704739bdfcbf9b1a43035840b2a1d65790d3a
parentdcf0f82d08e88ea952aa97c16e4e774ce6c2ceb8
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>
libavcodec/a64multienc.c
libavcodec/asv.c
libavcodec/asv.h
libavcodec/asvenc.c