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

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

author	Michael Niedermayer <michaelni@gmx.at>
	Tue, 5 Mar 2013 11:11:48 +0000 (12:11 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Tue, 5 Mar 2013 11:11:48 +0000 (12:11 +0100)
commit	06ad309ab4b7089442968fa8ac49b8db5e2fce0a
tree	d46cf264521ade26a73ff065e95ebf813ed195d9	tree \| snapshot
parent	d7f9f34dc683f4990c670a9e7a5964997e6380b3	commit \| diff
parent	813b82b927b19532e3bc3397b972c8a27b9f6326	commit \| diff

Merge commit '813b82b927b19532e3bc3397b972c8a27b9f6326'

* commit '813b82b927b19532e3bc3397b972c8a27b9f6326':
configure: Fix silly typo in logging command of check_struct()
fate: remove last incomplete frame from mpeg2-field-enc test

Conflicts:
tests/fate/video.mak
tests/ref/fate/mpeg2-field-enc

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

configure	diff1 \|	diff2 \|	blob \| history
tests/fate/video.mak	diff1 \|	diff2 \|	blob \| history
tests/ref/fate/mpeg2-field-enc	diff1 \|	diff2 \|	blob \| history

external/ffmpeg

RSS Atom

About OSDN

Find Software

Develop Software

Help

configure	diff1 \|	diff2 \|	blob \| history
tests/fate/video.mak	diff1 \|	diff2 \|	blob \| history
tests/ref/fate/mpeg2-field-enc	diff1 \|	diff2 \|	blob \| history