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)
* 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>
1  2 
.gitignore
libavformat/mpegts.c

diff --cc .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
Simple merge