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

author	Michael Niedermayer <michaelni@gmx.at>
	Sat, 30 Nov 2013 20:08:47 +0000 (21:08 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sat, 30 Nov 2013 20:09:42 +0000 (21:09 +0100)

* qatar/master:
dcadec: Add some logging before returning on error

Conflicts:
libavcodec/dcadec.c

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

		1	2
libavcodec/dcadec.c	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

external/ffmpeg

About OSDN

Find Software

Develop Software

Help