Merge commit '50dbe6b3544fa64d5611e16553bf542fd71276b8'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 02:57:05 +0000 (04:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 02:57:48 +0000 (04:57 +0200)
commiteeb9242b623c76bdda0ef842cf95d3dc03ca3b60
tree25319e951aded067c9ed6845c54a43c66945d2af
parent48579041bae5e19177b0d09e3b9cfcfc33d440d8
parent50dbe6b3544fa64d5611e16553bf542fd71276b8
Merge commit '50dbe6b3544fa64d5611e16553bf542fd71276b8'

* commit '50dbe6b3544fa64d5611e16553bf542fd71276b8':
  mov: fix assigment check

Conflicts:
libavformat/mov.c

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