generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2012-04-27 22:44:52 +02:00
commit 28c5775183
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitignore vendored
View File

@ -1,9 +1,14 @@
.config .config
.version .version
*.a
*.o *.o
*.d *.d
*.exe *.exe
*.ho *.ho
*.pc
*.so
*.so.*
*.ver
*-example *-example
*-test *-test
*_g *_g
@ -29,16 +34,7 @@ libavcodec/*_tablegen
libavcodec/*_tables.c libavcodec/*_tables.c
libavcodec/*_tables.h libavcodec/*_tables.h
libavcodec/codec_names.h libavcodec/codec_names.h
libavcodec/libavcodec*
libavcore/libavcore*
libavdevice/libavdevice*
libavfilter/libavfilter*
libavformat/libavformat*
libavutil/avconfig.h libavutil/avconfig.h
libavutil/libavutil*
libpostproc/libpostproc*
libswresample/libswresample*
libswscale/libswscale*
tests/audiogen tests/audiogen
tests/base64 tests/base64
tests/data tests/data

3
libavformat/mpegts.c
View File

@ -2074,6 +2074,7 @@ static int mpegts_read_packet(AVFormatContext *s,
MpegTSContext *ts = s->priv_data; MpegTSContext *ts = s->priv_data;
int ret, i; int ret, i;
pkt->size = -1;
ts->pkt = pkt; ts->pkt = pkt;
ret = handle_packets(ts, 0); ret = handle_packets(ts, 0);
if (ret < 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; return ret;
} }