Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Apr 2012 20:44:52 +0000 (22:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Apr 2012 20:44:52 +0000 (22:44 +0200)
commit28c5775183e528c24a597b01497159d9d4c5e2a6
tree870bb374d8bb85d8de2747554517e45d4fe45a73
parent18c6bd098baba1ace8fea946e4bc0c60098f49d4
parentdf8aa4598c7cc1c2f863f6fc6b2d4b3e6dc7345e
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
libavformat/mpegts.c