[FFmpeg-cvslog] Merge commit '50dbe6b3544fa64d5611e16553bf542fd71276b8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 25 04:57:05 2014 +0200| [eeb9242b623c76bdda0ef842cf95d3dc03ca3b60] | committer: Michael Niedermayer

Merge commit '50dbe6b3544fa64d5611e16553bf542fd71276b8'

* commit '50dbe6b3544fa64d5611e16553bf542fd71276b8':
  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=eeb9242b623c76bdda0ef842cf95d3dc03ca3b60
---