highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
dcda5ef1eab52a2392fd8f9ebf51a03052ddfce2
ffmpeg/libavcodec/a64multienc.c
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

14 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink