diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-27 22:44:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-27 22:44:52 +0200 |
| commit | 28c5775183e528c24a597b01497159d9d4c5e2a6 (patch) | |
| tree | 870bb374d8bb85d8de2747554517e45d4fe45a73 /.gitignore | |
| parent | 18c6bd098baba1ace8fea946e4bc0c60098f49d4 (diff) | |
| parent | df8aa4598c7cc1c2f863f6fc6b2d4b3e6dc7345e (diff) | |
| download | ffmpeg-streaming-28c5775183e528c24a597b01497159d9d4c5e2a6.zip ffmpeg-streaming-28c5775183e528c24a597b01497159d9d4c5e2a6.tar.gz | |
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>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 14 |
1 files changed, 5 insertions, 9 deletions
@@ -1,9 +1,14 @@ .config .version +*.a *.o *.d *.exe *.ho +*.pc +*.so +*.so.* +*.ver *-example *-test *_g @@ -29,16 +34,7 @@ libavcodec/*_tablegen libavcodec/*_tables.c libavcodec/*_tables.h libavcodec/codec_names.h -libavcodec/libavcodec* -libavcore/libavcore* -libavdevice/libavdevice* -libavfilter/libavfilter* -libavformat/libavformat* libavutil/avconfig.h -libavutil/libavutil* -libpostproc/libpostproc* -libswresample/libswresample* -libswscale/libswscale* tests/audiogen tests/base64 tests/data |
