* 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>
*.d
*.exe
*.ho
+ *.pc
+ *.so
+ *.so.*
+ *.ver
*-example
*-test
+*_g
+*.def
+*.dll
+*.lib
+*.exp
config.*
doc/*.1
doc/*.html
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