diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-05 01:46:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-05 02:26:17 +0200 |
| commit | 5d4fd1d1adf1ec17dd19548783f7f2eb0d64225f (patch) | |
| tree | 0ed0d9be892e55bea47d777dcd78d7c1cf104adf /libavformat/mxfenc.c | |
| parent | 96676e1abfece89e20bc962255b48cb2d9e417bd (diff) | |
| parent | 3824ef08e0878aa9f100f33ef22b61daf68058c2 (diff) | |
| download | ffmpeg-5d4fd1d1adf1ec17dd19548783f7f2eb0d64225f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (36 commits)
ARM: allow unaligned buffer in fixed-point NEON FFT4
fate: test more FFT etc sizes
dca: set AVCodecContext frame_size for DTS audio
YASM: Shut up unused variable compiler warning with --disable-yasm.
x86_32: Fix build on x86_32 with --disable-yasm.
iirfilter: add fate test
doxygen: Add qmul docs.
ogg: propagate return values and return more meaningful error values
H.264: fix overreads of qscale_table
Remove unused static tables and static inline functions.
eval: clear Parser instances before using
dct-test: remove 'ref' function pointer from tables
build: Remove deleted 'check' target from .PHONY list.
oggdec: Abort Ogg header parsing when encountering a data packet.
Add LGPL license boilerplate to files lacking it.
mxfenc: small typo fix
doxygen: Fix documentation for some VP8 functions.
sha: use AV_RB32() instead of assuming buffer can be cast to uint32_t*
des: allow unaligned input and output buffers
aes: allow unaligned input and output buffers
...
Conflicts:
libavcodec/dct-test.c
libavcodec/libvpxenc.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/h264_qpel_mmx.c
libavfilter/x86/gradfun.c
libavformat/oggdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxfenc.c')
| -rw-r--r-- | libavformat/mxfenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index c6532a3427..9b5b4b7455 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -1549,7 +1549,7 @@ static uint32_t ff_framenum_to_12m_time_code(unsigned frame, int drop, int fps) ((((frame / (fps * 60)) % 60) / 10) << 12) | // tens of minutes ((((frame / (fps * 60)) % 60) % 10) << 8) | // units of minutes (0 << 7) | // b1 - (0 << 6) | // b2 (NSC), field phase (PAL) + (0 << 6) | // b2 (NTSC), field phase (PAL) ((((frame / (fps * 3600) % 24)) / 10) << 4) | // tens of hours ( (frame / (fps * 3600) % 24)) % 10; // units of hours } |