[FFmpeg-cvslog] Merge commit 'b3b0b35db2f3b61bf2f0f4fa85f5b6267d83c8fe'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan  3 04:01:29 2015 +0100| [b0ba8a23b61506766f8497e2bf972da2077d235a] | committer: Michael Niedermayer

Merge commit 'b3b0b35db2f3b61bf2f0f4fa85f5b6267d83c8fe'

* commit 'b3b0b35db2f3b61bf2f0f4fa85f5b6267d83c8fe':
  movenc: Get rid of a hack for updating the dvc1 atom

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

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