Michael Niedermayer 28c5775183 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>

2012-04-27 22:44:52 +02:00

74 KiB

Raw Blame History

View Raw