Merge commit '2f221b6a9365aa400061e16266f2d1242f7169f8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Nov 2014 10:52:52 +0000 (11:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Nov 2014 10:52:55 +0000 (11:52 +0100)
commitea0b9218f4a60e1e2591bcc1fa745b43ea0411bf
treec27ddaab7b2272a0ce9307138baf6e184aaa4a62
parentf0158e6f0cc1bd6bf5d0485a325bdc654fcd3328
parent2f221b6a9365aa400061e16266f2d1242f7169f8
Merge commit '2f221b6a9365aa400061e16266f2d1242f7169f8'

* commit '2f221b6a9365aa400061e16266f2d1242f7169f8':
  movenc: Define the flag bits using shifts instead of as decimal numbers

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