Merge commit '71b8c8430cf3f7056849257324fc39b423075ba1' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Jun 2014 00:14:02 +0000 (02:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Jun 2014 00:14:02 +0000 (02:14 +0200)
commit7c520e5cd61a59ef2e243630ae407e274b8d84b9
tree53391fa2c33cb89b7b119f6b73e32dbc9b17f008
parentd076ee521647d9851c92840ec9eb82d4e0dedac9
parent71b8c8430cf3f7056849257324fc39b423075ba1
Merge commit '71b8c8430cf3f7056849257324fc39b423075ba1' into release/0.10

* commit '71b8c8430cf3f7056849257324fc39b423075ba1':
  sgidec: fix buffer size check in expand_rle_row()
  adx: check that the offset is not negative
  mpegvideo: set reference/pict_type on generated reference frames

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c
libavcodec/sgidec.c