[FFmpeg-cvslog] Merge commit 'd51f09962d5b4bc999fb70c040f330dd1873212e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 15 13:51:58 2014 +0100| [04cc753d0744ae25c2789b01597f041062378abd] | committer: Michael Niedermayer

Merge commit 'd51f09962d5b4bc999fb70c040f330dd1873212e'

* commit 'd51f09962d5b4bc999fb70c040f330dd1873212e':
  mov: Free intermediate arrays in the normal cleanup function

Conflicts:
	libavformat/mov.c

See: a6b3e6d0b49b47c9b874e59b88a8051af338f520
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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