diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-18 16:43:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-18 16:43:46 +0200 |
| commit | 3c3daf4d198306295e3342631f19422bdc258dbb (patch) | |
| tree | 96087928a24b17dbd893c7ab5dfa5f45a76de4ae /libavformat/gxfenc.c | |
| parent | 93263dc19e441f347baf9c36b5bc83693f16d084 (diff) | |
| parent | 9bc8bcddbd4fc394e2268e9849dcbf3bad6de980 (diff) | |
| download | ffmpeg-3c3daf4d198306295e3342631f19422bdc258dbb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
dsputil: remove disabled code
tta: remove disabled code
gxfenc: place variable declarations before statements
x86: Use LOCAL_ALIGNED in mpegvideo_mmx_template
random_seed: use proper #includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/gxfenc.c')
| -rw-r--r-- | libavformat/gxfenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index f45795b5f9..8496384a5d 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -396,6 +396,7 @@ static int gxf_write_umf_material_description(AVFormatContext *s) int timecode_base = gxf->time_base.den == 60000 ? 60 : 50; int64_t timestamp = 0; AVDictionaryEntry *t; + uint32_t timecode; #if FF_API_TIMESTAMP if (s->timestamp) @@ -406,7 +407,7 @@ static int gxf_write_umf_material_description(AVFormatContext *s) timestamp = ff_iso8601_to_unix_time(t->value); // XXX drop frame - uint32_t timecode = + timecode = gxf->nb_fields / (timecode_base * 3600) % 24 << 24 | // hours gxf->nb_fields / (timecode_base * 60) % 60 << 16 | // minutes gxf->nb_fields / timecode_base % 60 << 8 | // seconds |