git.osdn.net Git - android-x86/external-ffmpeg.git/commit

(root) / android-x86 / external-ffmpeg.git / commit

author	Michael Niedermayer <michaelni@gmx.at>
	Sun, 17 Nov 2013 02:31:32 +0000 (03:31 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sun, 17 Nov 2013 02:31:32 +0000 (03:31 +0100)
commit	92cbd775687204f9750a09c69f97702719036aab
tree	16a375879e56045652edd2dd8f604bb7fb2fb4d0	tree \| snapshot
parent	9ad477d9098b5281cede0bd8525ca90b0e52436d	commit \| diff
parent	d48c20630214a4effcc920e93a5044bee4e2002e	commit \| diff

Merge commit 'd48c20630214a4effcc920e93a5044bee4e2002e'

* commit 'd48c20630214a4effcc920e93a5044bee4e2002e':
  qtrleenc: use the AVFrame API properly.
  ulti: use the AVFrame API properly.
  vc1: use the AVFrame API properly.
  flashsv: use the AVFrame API properly.

Conflicts:
libavcodec/flashsv.c
libavcodec/qtrleenc.c
libavcodec/ulti.c
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/flashsv.c	diff1 \|	diff2 \|	blob \| history
libavcodec/qtrleenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ulti.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1.h	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1dec.c	diff1 \|	diff2 \|	blob \| history

external/ffmpeg

RSS Atom

About OSDN

Find Software

Develop Software

Help

libavcodec/flashsv.c	diff1 \|	diff2 \|	blob \| history
libavcodec/qtrleenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ulti.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1.h	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1dec.c	diff1 \|	diff2 \|	blob \| history