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>

diff --cc .gitignore
index d27b3bd,31a02c0..46d2d67
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -4,13 -5,12 +5,17 @@@
  *.d
  *.exe
  *.ho
+ *.pc
+ *.so
+ *.so.*
+ *.ver
  *-example
  *-test
 +*_g
 +*.def
 +*.dll
 +*.lib
 +*.exp
  config.*
  doc/*.1
  doc/*.html
@@@ -28,17 -26,7 +33,8 @@@ doc/print_option
  libavcodec/*_tablegen
  libavcodec/*_tables.c
  libavcodec/*_tables.h
- libavcodec/libavcodec*
- libavcore/libavcore*
- libavdevice/libavdevice*
- libavfilter/libavfilter*
- libavformat/libavformat*
 +libavcodec/codec_names.h
  libavutil/avconfig.h
- libavutil/libavutil*
- libpostproc/libpostproc*
- libswresample/libswresample*
- libswscale/libswscale*
  tests/audiogen
  tests/base64
  tests/data

diff --cc libavformat/mpegts.c
Simple merge