FFmpeg/libavcodec
Michael Niedermayer cc4a643563 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>
2013-11-17 00:11:33 +01:00
..
2013-10-30 11:04:06 +00:00
2013-11-15 10:16:28 +01:00
2013-10-30 11:04:06 +00:00
2013-10-30 23:56:52 +01:00
2013-10-31 20:19:59 +01:00
2013-10-28 23:54:28 +01:00
2013-11-15 10:16:28 +01:00
2013-10-30 12:41:43 +00:00
2013-11-05 13:19:30 +00:00
2013-11-05 13:19:30 +00:00
2013-10-28 23:54:28 +01:00
2013-11-05 12:44:20 +00:00
2013-11-15 10:16:28 +01:00
2013-11-15 10:16:28 +01:00
2013-11-15 10:16:28 +01:00
2013-10-30 11:04:06 +00:00