[FFmpeg-cvslog] Merge commit '600d5ee6b12bad144756b0772319bb04796bc528'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 30 02:45:55 2014 +0100| [7f24e1e1a2a95fa56301ac5f5463decb83cbcb68] | committer: Michael Niedermayer

Merge commit '600d5ee6b12bad144756b0772319bb04796bc528'

* commit '600d5ee6b12bad144756b0772319bb04796bc528':
  movenc: Signal iso6 in compatible_brands when using tfdt

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

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