diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 02:37:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 02:38:57 +0100 |
| commit | 70937d9708bc6ca801f3685d2075247f80aebcc5 (patch) | |
| tree | 39398b32c23fab5b8a87a68d697526bf162dcec6 /libavformat/sdp.c | |
| parent | a57da850c0ae7a9cde8917bb0f30dcee30b43439 (diff) | |
| parent | 82b9799bb211ecd117171115e4a8b832c4942314 (diff) | |
| download | ffmpeg-70937d9708bc6ca801f3685d2075247f80aebcc5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
sdp: Check that fmt->oformat is non-null before accessing it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sdp.c')
| -rw-r--r-- | libavformat/sdp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/sdp.c b/libavformat/sdp.c index 55ea0d9ee3..ae2948355d 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -402,7 +402,7 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c, switch (c->codec_id) { case AV_CODEC_ID_H264: { int mode = 1; - if (fmt && fmt->oformat->priv_class && + if (fmt && fmt->oformat && fmt->oformat->priv_class && av_opt_flag_is_set(fmt->priv_data, "rtpflags", "h264_mode0")) mode = 0; if (c->extradata_size) { |