generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mov: use new public timecode API.

Browse Source
This commit is contained in:
Clément Bœsch 2012-01-23 15:10:43 +01:00 committed by Clément Bœsch
parent ed67dac093
commit bd10f01aa8
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/mov.c
View File

@ -31,13 +31,13 @@
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/timecode.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
#include "avio_internal.h" #include "avio_internal.h"
#include "riff.h" #include "riff.h"
#include "isom.h" #include "isom.h"
#include "libavcodec/get_bits.h" #include "libavcodec/get_bits.h"
#include "libavcodec/timecode.h"
#include "id3v1.h" #include "id3v1.h"
#include "mov_chan.h" #include "mov_chan.h"
@ -2656,17 +2656,16 @@ finish:
static int parse_timecode_in_framenum_format(AVFormatContext *s, AVStream *st, static int parse_timecode_in_framenum_format(AVFormatContext *s, AVStream *st,
uint32_t value) uint32_t value)
{ {
char buf[16]; AVTimecode tc;
struct ff_timecode tc = { char buf[AV_TIMECODE_STR_SIZE];
.drop = st->codec->flags2 & CODEC_FLAG2_DROP_FRAME_TIMECODE, AVRational rate = {st->codec->time_base.den,
.rate = (AVRational){st->codec->time_base.den, st->codec->time_base.num};
st->codec->time_base.num}, int flags = st->codec->flags2 & CODEC_FLAG2_DROP_FRAME_TIMECODE ? AV_TIMECODE_FLAG_DROPFRAME : 0;
}; int ret = av_timecode_init(&tc, rate, flags, 0, s);
if (ret < 0)
if (avpriv_check_timecode_rate(s, tc.rate, tc.drop) < 0) return ret;
return AVERROR(EINVAL);
av_dict_set(&st->metadata, "timecode", av_dict_set(&st->metadata, "timecode",
avpriv_timecode_to_string(buf, &tc, value), 0); av_timecode_make_string(&tc, buf, value), 0);
return 0; return 0;
} }