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)
* commit '2f221b6a9365aa400061e16266f2d1242f7169f8':
  movenc: Define the flag bits using shifts instead of as decimal numbers

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

Simple merge