Merge commit '26ba78adacd8469fca97c8c833e2e6364b13b7c8' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:29:55 +0000 (01:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:30:15 +0000 (01:30 +0100)
commit97a55f00d35cb28497002329a17ab2f39a554cea
tree60004050216488b60ad1b459eba74e37e566dcd6
parentb6cd6da17329d65922626ff71eabdeff2e692032
parent26ba78adacd8469fca97c8c833e2e6364b13b7c8
Merge commit '26ba78adacd8469fca97c8c833e2e6364b13b7c8' into release/2.4

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

Conflicts:
libavformat/mov.c

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