Merge commit '62ed6da016b789eee00e0fff517df4a254e12e5d' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Feb 2014 05:32:39 +0000 (06:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Feb 2014 05:32:48 +0000 (06:32 +0100)
commitcb8180885f225df6ee6f03ac157aa7617a06ff50
treeff2b46d39aac68b17243d63a3400fb32d9ddfb59
parente2781db62a406114519d55c31dd534db6d60dd0d
parent62ed6da016b789eee00e0fff517df4a254e12e5d
Merge commit '62ed6da016b789eee00e0fff517df4a254e12e5d' into release/1.1

* commit '62ed6da016b789eee00e0fff517df4a254e12e5d':
  h264: check that an IDR NAL only contains I slices
  mov: Free an earlier allocated array if allocating a new one

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavformat/mov.c