diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-08 20:55:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-08 20:55:11 +0200 |
| commit | 5d6a40bc747da93bd4ee41a446c35fc60a399671 (patch) | |
| tree | 613c91012a37b3646f1575955d6124ffc4fdefe7 /libavformat/rtpdec_asf.c | |
| parent | 4f043c8a119101ffe8f6a57b18a47f602a350c30 (diff) | |
| parent | 9294f538e924dcb8f3938e4e3476340f1e5b552f (diff) | |
| download | ffmpeg-5d6a40bc747da93bd4ee41a446c35fc60a399671.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtsp: Don't use av_malloc(0) if there are no streams
rtsp: Don't use uninitialized data if there are no streams
vaapi: mpeg2: fix slice_vertical_position calculation.
hwaccel: mpeg2: decode first field, if requested.
cosmetics: Fix indentation
rtsp: Don't expose the MS-RTSP RTX data stream to the caller
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_asf.c')
| -rw-r--r-- | libavformat/rtpdec_asf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c index 65b466669d..84503f1749 100644 --- a/libavformat/rtpdec_asf.c +++ b/libavformat/rtpdec_asf.c @@ -130,6 +130,8 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p) static int asfrtp_parse_sdp_line(AVFormatContext *s, int stream_index, PayloadContext *asf, const char *line) { + if (stream_index < 0) + return 0; if (av_strstart(line, "stream:", &line)) { RTSPState *rt = s->priv_data; |