diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 15:48:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 15:48:39 +0100 |
| commit | ce795ac0f53e4c2e50667ac1bef38b82e945e96d (patch) | |
| tree | 3d559f9046b234d80820c392c1d73f983e048960 /libavformat | |
| parent | 5ea2a8d43e692bd4ed61edce3505b49ea65e36ce (diff) | |
| parent | c5c7e3e6f7cf17943c04bd078f260eaf789afbc9 (diff) | |
| download | ffmpeg-ce795ac0f53e4c2e50667ac1bef38b82e945e96d.tar.gz | |
Merge commit 'c5c7e3e6f7cf17943c04bd078f260eaf789afbc9' into release/1.1
* commit 'c5c7e3e6f7cf17943c04bd078f260eaf789afbc9':
gifdec: check that the image dimensions are non-zero
gifdec: return meaningful error codes.
eacmv: check the framerate before setting it.
rv30: fix extradata size check.
sdp: Check that fmt->oformat is non-null before accessing it
matroskadec: use correct compression parameters for current track CodecPrivate
vc1: Reset numref if fieldmode is not set
Conflicts:
libavcodec/gifdec.c
libavcodec/rv30.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -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 cdc3e212ef..3b9079c62e 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) { |