[FFmpeg-cvslog] Merge commit '62ed6da016b789eee00e0fff517df4a254e12e5d' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Tue Feb  4 06:32:39 2014 +0100| [cb8180885f225df6ee6f03ac157aa7617a06ff50] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb8180885f225df6ee6f03ac157aa7617a06ff50
---