Merge commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Nov 2014 22:59:57 +0000 (23:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Nov 2014 23:22:42 +0000 (00:22 +0100)
commit2893d1b36d17f4a244ce84311b0ace541c7e1593
treef1d9b10bac2a67fe30f5d0bbde61192415a93bd0
parent0d71e825dbb36a61c47a9f7847fa240700791430
parent1d8a0c1b43e58332a3a15c67d4adc161713cade8
Merge commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8'

* commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8':
  movenc: Allow to request not to use edit lists

Conflicts:
libavformat/movenc.c

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