@@ -86,7 +86,7 @@ static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap

 {

     struct dv1394_data *dv = context->priv_data;

-    dv->dv_demux = dv_init_demux(context);

+    dv->dv_demux = avpriv_dv_init_demux(context);

     if (!dv->dv_demux)

         goto failed;

@@ -124,7 +124,7 @@ static int dv1394_read_packet(AVFormatContext *context, AVPacket *pkt)

     struct dv1394_data *dv = context->priv_data;

     int size;

-    size = dv_get_packet(dv->dv_demux, pkt);

+    size = avpriv_dv_get_packet(dv->dv_demux, pkt);

     if (size > 0)

         return size;

@@ -186,7 +186,7 @@ restart_poll:

     av_dlog(context, "index %d, avail %d, done %d\n", dv->index, dv->avail,

             dv->done);

-    size = dv_produce_packet(dv->dv_demux, pkt,

+    size = avpriv_dv_produce_packet(dv->dv_demux, pkt,

                              dv->ring + (dv->index * DV1394_PAL_FRAME_SIZE),

                              DV1394_PAL_FRAME_SIZE);

     dv->index = (dv->index + 1) % DV1394_RING_FRAMES;

@@ -462,7 +462,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)

                 av_freep(&s->streams[0]);

                 s->nb_streams = 0;

                 if (CONFIG_DV_DEMUXER) {

-                    avi->dv_demux = dv_init_demux(s);

+                    avi->dv_demux = avpriv_dv_init_demux(s);

                     if (!avi->dv_demux)

                         goto fail;

                 }

@@ -979,7 +979,7 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)

     void* dstr;

     if (CONFIG_DV_DEMUXER && avi->dv_demux) {

-        int size = dv_get_packet(avi->dv_demux, pkt);

+        int size = avpriv_dv_get_packet(avi->dv_demux, pkt);

         if (size >= 0)

             return size;

     }

@@ -1079,7 +1079,7 @@ resync:

         if (CONFIG_DV_DEMUXER && avi->dv_demux) {

             dstr = pkt->destruct;

-            size = dv_produce_packet(avi->dv_demux, pkt,

+            size = avpriv_dv_produce_packet(avi->dv_demux, pkt,

                                     pkt->data, pkt->size);

             pkt->destruct = dstr;

             pkt->flags |= AV_PKT_FLAG_KEY;

@@ -270,7 +270,7 @@ static int dv_extract_video_info(DVDemuxContext *c, uint8_t* frame)

  * The following 3 functions constitute our interface to the world

  */

-DVDemuxContext* dv_init_demux(AVFormatContext *s)

+DVDemuxContext* avpriv_dv_init_demux(AVFormatContext *s)

 {

     DVDemuxContext *c;

@@ -299,7 +299,7 @@ DVDemuxContext* dv_init_demux(AVFormatContext *s)

     return c;

 }

-int dv_get_packet(DVDemuxContext *c, AVPacket *pkt)

+int avpriv_dv_get_packet(DVDemuxContext *c, AVPacket *pkt)

 {

     int size = -1;

     int i;

@@ -316,7 +316,7 @@ int dv_get_packet(DVDemuxContext *c, AVPacket *pkt)

     return size;

 }

-int dv_produce_packet(DVDemuxContext *c, AVPacket *pkt,

+int avpriv_dv_produce_packet(DVDemuxContext *c, AVPacket *pkt,

                       uint8_t* buf, int buf_size)

 {

     int size, i;

@@ -407,7 +407,7 @@ static int dv_read_header(AVFormatContext *s,

     unsigned state, marker_pos = 0;

     RawDVContext *c = s->priv_data;

-    c->dv_demux = dv_init_demux(s);

+    c->dv_demux = avpriv_dv_init_demux(s);

     if (!c->dv_demux)

         return -1;

@@ -450,7 +450,7 @@ static int dv_read_packet(AVFormatContext *s, AVPacket *pkt)

     int size;

     RawDVContext *c = s->priv_data;

-    size = dv_get_packet(c->dv_demux, pkt);

+    size = avpriv_dv_get_packet(c->dv_demux, pkt);

     if (size < 0) {

         if (!c->dv_demux->sys)

@@ -459,7 +459,7 @@ static int dv_read_packet(AVFormatContext *s, AVPacket *pkt)

         if (avio_read(s->pb, c->buf, size) <= 0)

             return AVERROR(EIO);

-        size = dv_produce_packet(c->dv_demux, pkt, c->buf, size);

+        size = avpriv_dv_produce_packet(c->dv_demux, pkt, c->buf, size);

     }

     return size;

@@ -31,9 +31,9 @@

 #include "avformat.h"

 typedef struct DVDemuxContext DVDemuxContext;

-DVDemuxContext* dv_init_demux(AVFormatContext* s);

-int dv_get_packet(DVDemuxContext*, AVPacket *);

-int dv_produce_packet(DVDemuxContext*, AVPacket*, uint8_t*, int);

+DVDemuxContext* avpriv_dv_init_demux(AVFormatContext* s);

+int avpriv_dv_get_packet(DVDemuxContext*, AVPacket *);

+int avpriv_dv_produce_packet(DVDemuxContext*, AVPacket*, uint8_t*, int);

 void dv_offset_reset(DVDemuxContext *c, int64_t frame_offset);

 typedef struct DVMuxContext DVMuxContext;

@@ -1249,7 +1249,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)

 #if CONFIG_DV_DEMUXER

     case CODEC_ID_DVAUDIO:

         c->dv_fctx = avformat_alloc_context();

-        c->dv_demux = dv_init_demux(c->dv_fctx);

+        c->dv_demux = avpriv_dv_init_demux(c->dv_fctx);

         if (!c->dv_demux) {

             av_log(c->fc, AV_LOG_ERROR, "dv demux context init error\n");

             return -1;

@@ -2528,10 +2528,10 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)

         }

 #if CONFIG_DV_DEMUXER

         if (mov->dv_demux && sc->dv_audio_container) {

-            dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size);

+            avpriv_dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size);

             av_free(pkt->data);

             pkt->size = 0;

-            ret = dv_get_packet(mov->dv_demux, pkt);

+            ret = avpriv_dv_get_packet(mov->dv_demux, pkt);

             if (ret < 0)

                 return ret;

         }