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

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

author	Michael Niedermayer <michaelni@gmx.at>
	Fri, 27 Apr 2012 20:44:52 +0000 (22:44 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Fri, 27 Apr 2012 20:44:52 +0000 (22:44 +0200)
commit	28c5775183e528c24a597b01497159d9d4c5e2a6
tree	870bb374d8bb85d8de2747554517e45d4fe45a73	tree \| snapshot
parent	18c6bd098baba1ace8fea946e4bc0c60098f49d4	commit \| diff
parent	df8aa4598c7cc1c2f863f6fc6b2d4b3e6dc7345e	commit \| diff

Merge remote-tracking branch 'qatar/master'

* qatar/master:
mpegts: Make sure we don't return uninitialized packets
gitignore: replace library catch-all pattern by more specific patterns

Conflicts:
.gitignore

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

.gitignore	diff1 \|	diff2 \|	blob \| history
libavformat/mpegts.c	diff1 \|	diff2 \|	blob \| history

external/ffmpeg

RSS Atom

About OSDN

Find Software

Develop Software

Help

.gitignore	diff1 \|	diff2 \|	blob \| history
libavformat/mpegts.c	diff1 \|	diff2 \|	blob \| history