mpeg12dec: reset first_field with picture_structure changes.

[ffmpeg] / libavformat / dvenc.c

diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c
index ae348297b46de8710b7a5caa41cc11122f46e75c..049bb7b3d2fc0630010a22348990bf05582cd56c 100644 (file)
--- 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;
@@ -320,7 +320,7 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s)
                           c->ast[i]->codec->channels    != 2))
             goto bail_out;
     }
-    c->sys = ff_dv_codec_profile(vst->codec);
+    c->sys = avpriv_dv_codec_profile(vst->codec);
     if (!c->sys)
         goto bail_out;
 
@@ -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;