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_h264.c | |
| parent | 4f043c8a119101ffe8f6a57b18a47f602a350c30 (diff) | |
| parent | 9294f538e924dcb8f3938e4e3476340f1e5b552f (diff) | |
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_h264.c')
| -rw-r--r-- | libavformat/rtpdec_h264.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c index 01514c1bef..0366ba0205 100644 --- a/libavformat/rtpdec_h264.c +++ b/libavformat/rtpdec_h264.c @@ -357,10 +357,15 @@ static void h264_free_context(PayloadContext *data) static int parse_h264_sdp_line(AVFormatContext *s, int st_index, PayloadContext *h264_data, const char *line) { - AVStream *stream = s->streams[st_index]; - AVCodecContext *codec = stream->codec; + AVStream *stream; + AVCodecContext *codec; const char *p = line; + if (st_index < 0) + return 0; + + stream = s->streams[st_index]; + codec = stream->codec; assert(h264_data->cookie == MAGIC_COOKIE); if (av_strstart(p, "framesize:", &p)) { |