Merge commit 'b3b0b35db2f3b61bf2f0f4fa85f5b6267d83c8fe'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Jan 2015 03:01:29 +0000 (04:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Jan 2015 03:01:34 +0000 (04:01 +0100)
commitb0ba8a23b61506766f8497e2bf972da2077d235a
treecbef29880a6c5c90c91f1a7c55a669b67cbfcb9a
parentf38e2bcb72ee2df60ce0fbeb2e33ce0ca8ebd7e8
parentb3b0b35db2f3b61bf2f0f4fa85f5b6267d83c8fe
Merge commit 'b3b0b35db2f3b61bf2f0f4fa85f5b6267d83c8fe'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c
libavformat/movenc.h