aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-27 22:44:52 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-27 22:44:52 +0200
commit28c5775183e528c24a597b01497159d9d4c5e2a6 (patch)
tree870bb374d8bb85d8de2747554517e45d4fe45a73
parent18c6bd098baba1ace8fea946e4bc0c60098f49d4 (diff)
parentdf8aa4598c7cc1c2f863f6fc6b2d4b3e6dc7345e (diff)
downloadffmpeg-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>
-rw-r--r--.gitignore14
-rw-r--r--libavformat/mpegts.c3
2 files changed, 8 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index d27b3bda05..46d2d67c02 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 12b289340f..4489a58e50 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;
}