[FFmpeg-cvslog] Merge commit '26ba78adacd8469fca97c8c833e2e6364b13b7c8' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 01:29:55 2015 +0100| [97a55f00d35cb28497002329a17ab2f39a554cea] | committer: Michael Niedermayer

Merge commit '26ba78adacd8469fca97c8c833e2e6364b13b7c8' into release/2.4

* commit '26ba78adacd8469fca97c8c833e2e6364b13b7c8':
  mov: fix assigment check

Conflicts:
	libavformat/mov.c

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

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