Merge commit '44079902c49e526f464bb4eb855665e1af867e91' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Feb 2014 05:17:49 +0000 (06:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Feb 2014 05:23:46 +0000 (06:23 +0100)
commite2781db62a406114519d55c31dd534db6d60dd0d
tree177a15668587407f6601758a21ef6fe84c49cf6b
parent9ac7d8f85d71f50d01d97f33cf0cc9f7707d62a3
parent44079902c49e526f464bb4eb855665e1af867e91
Merge commit '44079902c49e526f464bb4eb855665e1af867e91' into release/1.1

* commit '44079902c49e526f464bb4eb855665e1af867e91':
  mov: Free intermediate arrays in the normal cleanup function
  segafilm: fix leaks if reading the header fails
  h264_cavlc: check the size of the intra PCM data.
  h263: Check init_get_bits return value
  cavsdec: check ff_get_buffer() return value

Conflicts:
libavcodec/cavsdec.c
libavcodec/h263dec.c
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/cavsdec.c
libavcodec/h263dec.c
libavcodec/h264_cavlc.c
libavformat/mov.c
libavformat/segafilm.c