Merge commit '60198742ff851f11a3757c713fc75a9c19b88566'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Aug 2013 12:16:52 +0000 (14:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Aug 2013 12:16:52 +0000 (14:16 +0200)
commit25e4ec6aa14d5e9f2aebc87e1f076c4669f2e1f7
treebc72f44369a2f248ed136aad95d9d40ee8f085b8
parent606a30c5a11522130658e0807b340ce922a390a6
parent60198742ff851f11a3757c713fc75a9c19b88566
Merge commit '60198742ff851f11a3757c713fc75a9c19b88566'

* commit '60198742ff851f11a3757c713fc75a9c19b88566':
  movenc: fix detection of 64bit offset requirement

Conflicts:
libavformat/movenc.c

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