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>

2 files changed, 8 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index d27b3bd..46d2d67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 12b2893..4489a58 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -2074,6 +2074,7 @@ static int mpegts_read_packet(AVFormatContext *s,
     MpegTSContext *ts = s->priv_data;
     int ret, i;
 
+    pkt->size = -1;
     ts->pkt = pkt;
     ret = handle_packets(ts, 0);
     if (ret < 0) {
@@ -2091,6 +2092,8 @@ static int mpegts_read_packet(AVFormatContext *s,
         }
     }
 
+    if (!ret && pkt->size < 0)
+        ret = AVERROR(EINTR);
     return ret;
 }