diff options
| author | Clément Bœsch <clement.boesch@smartjog.com> | 2011-12-07 10:44:50 +0100 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2011-12-12 17:49:34 +0100 |
| commit | 80914cde6f2b5d6584c74bad6b3613d16dfbda67 (patch) | |
| tree | bd6fee73a0ebaae4974e70b09193b8ee24f09236 /libavformat | |
| parent | fa4e30af7e589c27437d2b96a384d4ad1c3485ad (diff) | |
| download | ffmpeg-80914cde6f2b5d6584c74bad6b3613d16dfbda67.tar.gz | |
timecode: rename internal ff_* symbols to avpriv_*.
Those functions are shared between libs.
Also fix a typo in function names: smtpe → smpte.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/dvenc.c | 8 | ||||
| -rw-r--r-- | libavformat/mxfenc.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index ce6568b5eb..049bb7b3d2 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -92,9 +92,9 @@ static int dv_write_pack(enum dv_pack_type pack_id, DVMuxContext *c, uint8_t* bu */ ltc_frame = c->tc.start + c->frames; if (c->tc.drop) - ltc_frame = ff_framenum_to_drop_timecode(ltc_frame); - timecode = ff_framenum_to_smtpe_timecode(ltc_frame, c->sys->ltc_divisor, - c->tc.drop); + ltc_frame = avpriv_framenum_to_drop_timecode(ltc_frame); + timecode = avpriv_framenum_to_smpte_timecode(ltc_frame, c->sys->ltc_divisor, + c->tc.drop); timecode |= 1<<23 | 1<<15 | 1<<7 | 1<<6; // biphase and binary group flags AV_WB32(buf + 1, timecode); break; @@ -378,7 +378,7 @@ static int dv_write_header(AVFormatContext *s) if (dvc->tc.str) { dvc->tc.rate.num = dvc->sys->time_base.den; dvc->tc.rate.den = dvc->sys->time_base.num; - if (ff_init_smtpe_timecode(s, &dvc->tc) < 0) + if (avpriv_init_smpte_timecode(s, &dvc->tc) < 0) return -1; } return 0; diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index c209c5c5e5..881902b2f8 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -1432,7 +1432,7 @@ static int mxf_write_header(AVFormatContext *s) if (mxf->tc.str) { mxf->tc.rate.num = mxf->time_base.den; mxf->tc.rate.den = mxf->time_base.num; - if (ff_init_smtpe_timecode(s, &mxf->tc) < 0) + if (avpriv_init_smpte_timecode(s, &mxf->tc) < 0) return -1; } if (s->oformat == &ff_mxf_d10_muxer) { @@ -1572,9 +1572,9 @@ static void mxf_write_system_item(AVFormatContext *s) avio_w8(pb, 0x81); // SMPTE 12M time code time_code = frame; if (mxf->tc.drop) - time_code = ff_framenum_to_drop_timecode(time_code); - time_code = ff_framenum_to_smtpe_timecode(time_code, mxf->timecode_base, - mxf->tc.drop); + time_code = avpriv_framenum_to_drop_timecode(time_code); + time_code = avpriv_framenum_to_smpte_timecode(time_code, mxf->timecode_base, + mxf->tc.drop); avio_wb32(pb, time_code); avio_wb32(pb, 0); // binary group data avio_wb64(pb, 0); |