Merge commit 'c5c7e3e6f7cf17943c04bd078f260eaf789afbc9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Jan 2014 14:48:39 +0000 (15:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Jan 2014 14:48:39 +0000 (15:48 +0100)
commitce795ac0f53e4c2e50667ac1bef38b82e945e96d
tree3d559f9046b234d80820c392c1d73f983e048960
parent5ea2a8d43e692bd4ed61edce3505b49ea65e36ce
parentc5c7e3e6f7cf17943c04bd078f260eaf789afbc9
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>
libavcodec/eacmv.c
libavcodec/gifdec.c
libavcodec/rv30.c
libavcodec/vc1.c
libavformat/sdp.c