Merge remote-tracking branch 'qatar/master'

* qatar/master: (27 commits)
  ppc: Add ff_ prefix to nonstatic symbols
  sh4: Add ff_ prefix to nonstatic symbols
  mpegvideo: Add ff_ prefix to nonstatic functions
  rtjpeg: Add ff_ prefix to nonstatic symbols
  rv: Add ff_ prefix to nonstatic symbols
  vp56: Add ff_ prefix to nonstatic symbols
  vorbis: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefix to nonstatic symbols
  vc1: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefixes to nonstatic symbols
  snow: Add ff_ prefix to nonstatic symbols
  mpeg12: Add ff_ prefix to nonstatic symbols
  mpeg4: Add ff_ prefixes to nonstatic symbols
  lagarith: Add ff_ prefix to lag_rac_init
  libavcodec: Add ff_ prefix to j_rev_dct*
  dsputil: Add ff_ prefix to inv_zigzag_direct16
  libavcodec: Prefix fdct_ifast, fdct_ifast248
  dsputil: Add ff_ prefix to the dsputil*_init* functions
  libavcodec: Add ff_ prefix to some nonstatic symbols
  vlc/rl: Add ff_ prefix to the nonstatic symbols
  ...

Conflicts:
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/dnxhddec.c
	libavcodec/ffv1.c
	libavcodec/h263.h
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/nuv.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/proresdsp.c
	libavcodec/svq3.c
	libavcodec/version.h
	libavformat/dv.h
	libavformat/dvenc.c
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

29 files changed, 42 insertions, 42 deletions

diff --git a/libavformat/aea.c b/libavformat/aea.c
index d849ade6f2..3e25e5326c 100644
--- a/libavformat/aea.c
+++ b/libavformat/aea.c
@@ -99,7 +99,7 @@ AVInputFormat ff_aea_demuxer = {
     .read_probe     = aea_read_probe,
     .read_header    = aea_read_header,
     .read_packet    = aea_read_packet,
-    .read_seek      = pcm_read_seek,
+    .read_seek      = ff_pcm_read_seek,
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "aea",
 };
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 0f683837a3..fbbf6a41e7 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -325,6 +325,6 @@ AVInputFormat ff_aiff_demuxer = {
     .read_probe     = aiff_probe,
     .read_header    = aiff_read_header,
     .read_packet    = aiff_read_packet,
-    .read_seek      = pcm_read_seek,
+    .read_seek      = ff_pcm_read_seek,
     .codec_tag= (const AVCodecTag* const []){ff_codec_aiff_tags, 0},
 };
diff --git a/libavformat/au.c b/libavformat/au.c
index 05ec1eea31..b29b45d3c7 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -197,7 +197,7 @@ AVInputFormat ff_au_demuxer = {
     .read_probe     = au_probe,
     .read_header    = au_read_header,
     .read_packet    = au_read_packet,
-    .read_seek      = pcm_read_seek,
+    .read_seek      = ff_pcm_read_seek,
     .codec_tag= (const AVCodecTag* const []){codec_au_tags, 0},
 };
 #endif
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 704980c7a1..a88ceb1de5 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1412,7 +1412,7 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
 
         /* Feed the DV video stream version of the timestamp to the */
         /* DV demux so it can synthesize correct timestamps.        */
-        dv_offset_reset(avi->dv_demux, timestamp);
+        ff_dv_offset_reset(avi->dv_demux, timestamp);
 
         avi->stream_index= -1;
         return 0;
diff --git a/libavformat/avs.c b/libavformat/avs.c
index ed98ad7313..75efe15306 100644
--- a/libavformat/avs.c
+++ b/libavformat/avs.c
@@ -124,7 +124,7 @@ static int avs_read_audio_packet(AVFormatContext * s, AVPacket * pkt)
     int ret, size;
 
     size = avio_tell(s->pb);
-    ret = voc_get_packet(s, pkt, avs->st_audio, avs->remaining_audio_size);
+    ret = ff_voc_get_packet(s, pkt, avs->st_audio, avs->remaining_audio_size);
     size = avio_tell(s->pb) - size;
     avs->remaining_audio_size -= size;
 
diff --git a/libavformat/c93.c b/libavformat/c93.c
index a5c2b5d7d6..5a044d9d3d 100644
--- a/libavformat/c93.c
+++ b/libavformat/c93.c
@@ -123,7 +123,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
                 c93->audio->codec->codec_type = AVMEDIA_TYPE_AUDIO;
             }
             avio_skip(pb, 26); /* VOC header */
-            ret = voc_get_packet(s, pkt, c93->audio, datasize - 26);
+            ret = ff_voc_get_packet(s, pkt, c93->audio, datasize - 26);
             if (ret > 0) {
                 pkt->stream_index = 1;
                 pkt->flags |= AV_PKT_FLAG_KEY;
diff --git a/libavformat/cutils.c b/libavformat/cutils.c
index 22be2c3384..0458a2dc7c 100644
--- a/libavformat/cutils.c
+++ b/libavformat/cutils.c
@@ -26,7 +26,7 @@
 
 /* This is our own gmtime_r. It differs from its POSIX counterpart in a
    couple of places, though. */
-struct tm *brktimegm(time_t secs, struct tm *tm)
+struct tm *ff_brktimegm(time_t secs, struct tm *tm)
 {
     int days, y, ny, m;
     int md[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
diff --git a/libavformat/dv.c b/libavformat/dv.c
index 72f152d6b9..752475a3b6 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -424,7 +424,7 @@ static int64_t dv_frame_offset(AVFormatContext *s, DVDemuxContext *c,
     return offset + s->data_offset;
 }
 
-void dv_offset_reset(DVDemuxContext *c, int64_t frame_offset)
+void ff_dv_offset_reset(DVDemuxContext *c, int64_t frame_offset)
 {
     c->frames= frame_offset;
     if (c->ach)
@@ -552,7 +552,7 @@ static int dv_read_seek(AVFormatContext *s, int stream_index,
     if (avio_seek(s->pb, offset, SEEK_SET) < 0)
         return -1;
 
-    dv_offset_reset(c, offset / c->sys->frame_size);
+    ff_dv_offset_reset(c, offset / c->sys->frame_size);
     return 0;
 }
 
diff --git a/libavformat/dv.h b/libavformat/dv.h
index 722067f206..160c6ab873 100644
--- a/libavformat/dv.h
+++ b/libavformat/dv.h
@@ -34,7 +34,7 @@ typedef struct DVDemuxContext DVDemuxContext;
 DVDemuxContext* avpriv_dv_init_demux(AVFormatContext* s);
 int avpriv_dv_get_packet(DVDemuxContext*, AVPacket *);
 int avpriv_dv_produce_packet(DVDemuxContext*, AVPacket*, uint8_t*, int, int64_t);
-void dv_offset_reset(DVDemuxContext *c, int64_t frame_offset);
+void ff_dv_offset_reset(DVDemuxContext *c, int64_t frame_offset);
 
 typedef struct DVMuxContext DVMuxContext;
 
diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c
index 065f8dc7ac..43d654ca20 100644
--- a/libavformat/dvenc.c
+++ b/libavformat/dvenc.c
@@ -130,7 +130,7 @@ static int dv_write_pack(enum dv_pack_type pack_id, DVMuxContext *c, uint8_t* bu
     case dv_video_recdate:  /* VAUX recording date */
         ct = c->start_time + av_rescale_rnd(c->frames, c->sys->time_base.num,
                                             c->sys->time_base.den, AV_ROUND_DOWN);
-        brktimegm(ct, &tc);
+        ff_brktimegm(ct, &tc);
         buf[1] = 0xff; /* ds, tm, tens of time zone, units of time zone */
                        /* 0xff is very likely to be "unknown" */
         buf[2] = (3 << 6) | /* reserved -- always 1 */
@@ -146,7 +146,7 @@ static int dv_write_pack(enum dv_pack_type pack_id, DVMuxContext *c, uint8_t* bu
     case dv_video_rectime:  /* VAUX recording time */
         ct = c->start_time + av_rescale_rnd(c->frames, c->sys->time_base.num,
                                                        c->sys->time_base.den, AV_ROUND_DOWN);
-        brktimegm(ct, &tc);
+        ff_brktimegm(ct, &tc);
         buf[1] = (3 << 6) | /* reserved -- always 1 */
                  0x3f; /* tens of frame, units of frame: 0x3f - "unknown" ? */
         buf[2] = (1 << 7) | /* reserved -- always 1 */
diff --git a/libavformat/internal.h b/libavformat/internal.h
index 94c66b9ef8..f2b89a3384 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -52,7 +52,7 @@ do {\
 } while(0)
 #endif
 
-struct tm *brktimegm(time_t secs, struct tm *tm);
+struct tm *ff_brktimegm(time_t secs, struct tm *tm);
 
 char *ff_data_to_hex(char *buf, const uint8_t *src, int size, int lowercase);
 
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 699cd0e217..0c78b8b04b 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -66,7 +66,7 @@ const AVCodecTag ff_mp4_obj_type[] = {
     { CODEC_ID_NONE      ,    0 },
 };
 
-const AVCodecTag codec_movvideo_tags[] = {
+const AVCodecTag ff_codec_movvideo_tags[] = {
 /*  { CODEC_ID_, MKTAG('I', 'V', '5', '0') }, *//* Indeo 5.0 */
 
     { CODEC_ID_RAWVIDEO, MKTAG('r', 'a', 'w', ' ') }, /* Uncompressed RGB */
@@ -230,7 +230,7 @@ const AVCodecTag codec_movvideo_tags[] = {
     { CODEC_ID_NONE, 0 },
 };
 
-const AVCodecTag codec_movaudio_tags[] = {
+const AVCodecTag ff_codec_movaudio_tags[] = {
     { CODEC_ID_AAC,             MKTAG('m', 'p', '4', 'a') },
     { CODEC_ID_AC3,             MKTAG('a', 'c', '-', '3') }, /* ETSI TS 102 366 Annex F */
     { CODEC_ID_AC3,             MKTAG('s', 'a', 'c', '3') }, /* Nero Recode */
diff --git a/libavformat/isom.h b/libavformat/isom.h
index eb9218ef45..776b265099 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -30,8 +30,8 @@
 
 /* isom.c */
 extern const AVCodecTag ff_mp4_obj_type[];
-extern const AVCodecTag codec_movvideo_tags[];
-extern const AVCodecTag codec_movaudio_tags[];
+extern const AVCodecTag ff_codec_movvideo_tags[];
+extern const AVCodecTag ff_codec_movaudio_tags[];
 extern const AVCodecTag ff_codec_movsubtitle_tags[];
 
 int ff_mov_iso639_to_lang(const char lang[4], int mp4);
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index ddf60e48b2..ac819f7855 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1474,7 +1474,7 @@ static int matroska_read_header(AVFormatContext *s)
                    && (track->codec_priv.size >= 86)
                    && (track->codec_priv.data != NULL)) {
             fourcc = AV_RL32(track->codec_priv.data);
-            codec_id = ff_codec_get_id(codec_movvideo_tags, fourcc);
+            codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc);
         } else if (codec_id == CODEC_ID_PCM_S16BE) {
             switch (track->audio.bitdepth) {
             case  8:  codec_id = CODEC_ID_PCM_U8;     break;
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index e74366fe95..0ee83486a6 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -480,7 +480,7 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecCo
     } else if (codec->codec_type == AVMEDIA_TYPE_VIDEO) {
         if (qt_id) {
             if (!codec->codec_tag)
-                codec->codec_tag = ff_codec_get_tag(codec_movvideo_tags, codec->codec_id);
+                codec->codec_tag = ff_codec_get_tag(ff_codec_movvideo_tags, codec->codec_id);
             if (codec->extradata_size)
                 avio_write(dyn_cp, codec->extradata, codec->extradata_size);
         } else {
@@ -586,7 +586,7 @@ static int mkv_write_tracks(AVFormatContext *s)
                     put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, av_q2d(codec->time_base)*1E9);
 
                 if (!native_id &&
-                      ff_codec_get_tag(codec_movvideo_tags, codec->codec_id) &&
+                      ff_codec_get_tag(ff_codec_movvideo_tags, codec->codec_id) &&
                     (!ff_codec_get_tag(ff_codec_bmp_tags,   codec->codec_id)
                      || codec->codec_id == CODEC_ID_SVQ1
                      || codec->codec_id == CODEC_ID_SVQ3
diff --git a/libavformat/mmf.c b/libavformat/mmf.c
index cbbb7dfed7..b732e1f334 100644
--- a/libavformat/mmf.c
+++ b/libavformat/mmf.c
@@ -297,7 +297,7 @@ AVInputFormat ff_mmf_demuxer = {
     .read_probe     = mmf_probe,
     .read_header    = mmf_read_header,
     .read_packet    = mmf_read_packet,
-    .read_seek      = pcm_read_seek,
+    .read_seek      = ff_pcm_read_seek,
 };
 #endif
 #if CONFIG_MMF_MUXER
diff --git a/libavformat/mov.c b/libavformat/mov.c
index e251535a55..71b96c192f 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1170,7 +1170,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
 
         if (st->codec->codec_tag &&
             st->codec->codec_tag != format &&
-            (c->fc->video_codec_id ? ff_codec_get_id(codec_movvideo_tags, format) != c->fc->video_codec_id
+            (c->fc->video_codec_id ? ff_codec_get_id(ff_codec_movvideo_tags, format) != c->fc->video_codec_id
                                    : st->codec->codec_tag != MKTAG('j','p','e','g'))
            ){
             /* Multiple fourcc, we skip JPEG. This is not correct, we should
@@ -1187,7 +1187,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
         sc->dref_id= dref_id;
 
         st->codec->codec_tag = format;
-        id = ff_codec_get_id(codec_movaudio_tags, format);
+        id = ff_codec_get_id(ff_codec_movaudio_tags, format);
         if (id<=0 && ((format&0xFFFF) == 'm'+('s'<<8) || (format&0xFFFF) == 'T'+('S'<<8)))
             id = ff_codec_get_id(ff_codec_wav_tags, av_bswap32(format)&0xFFFF);
 
@@ -1195,7 +1195,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
             st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
         } else if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO && /* do not overwrite codec type */
                    format && format != MKTAG('m','p','4','s')) { /* skip old asf mpeg4 tag */
-            id = ff_codec_get_id(codec_movvideo_tags, format);
+            id = ff_codec_get_id(ff_codec_movvideo_tags, format);
             if (id <= 0)
                 id = ff_codec_get_id(ff_codec_bmp_tags, format);
             if (id > 0)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index dfd6385b24..449c641e6e 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -863,7 +863,7 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track)
         else if (track->enc->codec_id == CODEC_ID_RAWVIDEO)
             tag = mov_get_rawvideo_codec_tag(s, track);
         else if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO) {
-            tag = ff_codec_get_tag(codec_movvideo_tags, track->enc->codec_id);
+            tag = ff_codec_get_tag(ff_codec_movvideo_tags, track->enc->codec_id);
             if (!tag) { // if no mac fcc found, try with Microsoft tags
                 tag = ff_codec_get_tag(ff_codec_bmp_tags, track->enc->codec_id);
                 if (tag)
@@ -871,7 +871,7 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track)
                            "the file may be unplayable!\n");
             }
         } else if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO) {
-            tag = ff_codec_get_tag(codec_movaudio_tags, track->enc->codec_id);
+            tag = ff_codec_get_tag(ff_codec_movaudio_tags, track->enc->codec_id);
             if (!tag) { // if no mac fcc found, try with Microsoft tags
                 int ms_tag = ff_codec_get_tag(ff_codec_wav_tags, track->enc->codec_id);
                 if (ms_tag) {
@@ -3310,7 +3310,7 @@ AVOutputFormat ff_mov_muxer = {
     .write_packet      = ff_mov_write_packet,
     .write_trailer     = mov_write_trailer,
     .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
-    .codec_tag = (const AVCodecTag* const []){codec_movvideo_tags, codec_movaudio_tags, 0},
+    .codec_tag = (const AVCodecTag* const []){ff_codec_movvideo_tags, ff_codec_movaudio_tags, 0},
     .priv_class = &mov_muxer_class,
 };
 #endif
diff --git a/libavformat/omadec.c b/libavformat/omadec.c
index 2f100b8f56..adf08a621c 100644
--- a/libavformat/omadec.c
+++ b/libavformat/omadec.c
@@ -415,7 +415,7 @@ static int oma_read_seek(struct AVFormatContext *s, int stream_index, int64_t ti
 {
     OMAContext *oc = s->priv_data;
 
-    pcm_read_seek(s, stream_index, timestamp, flags);
+    ff_pcm_read_seek(s, stream_index, timestamp, flags);
 
     if (oc->encrypted) {
         /* readjust IV for CBC */
diff --git a/libavformat/pcm.c b/libavformat/pcm.c
index d66be59ccb..bba741de53 100644
--- a/libavformat/pcm.c
+++ b/libavformat/pcm.c
@@ -23,8 +23,8 @@
 #include "avformat.h"
 #include "pcm.h"
 
-int pcm_read_seek(AVFormatContext *s,
-                  int stream_index, int64_t timestamp, int flags)
+int ff_pcm_read_seek(AVFormatContext *s,
+                     int stream_index, int64_t timestamp, int flags)
 {
     AVStream *st;
     int block_align, byte_rate;
diff --git a/libavformat/pcm.h b/libavformat/pcm.h
index 7c0b7d70aa..60d8eb3da0 100644
--- a/libavformat/pcm.h
+++ b/libavformat/pcm.h
@@ -24,7 +24,7 @@
 
 #include "avformat.h"
 
-int pcm_read_seek(AVFormatContext *s,
-                  int stream_index, int64_t timestamp, int flags);
+int ff_pcm_read_seek(AVFormatContext *s,
+                     int stream_index, int64_t timestamp, int flags);
 
 #endif /* AVFORMAT_PCM_H */
diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c
index e27a6b908c..eacac2f353 100644
--- a/libavformat/pcmdec.c
+++ b/libavformat/pcmdec.c
@@ -67,7 +67,7 @@ AVInputFormat ff_pcm_ ## name_ ## _demuxer = {              \
     .priv_data_size = sizeof(RawAudioDemuxerContext),       \
     .read_header    = ff_raw_read_header,                   \
     .read_packet    = raw_read_packet,                      \
-    .read_seek      = pcm_read_seek,                        \
+    .read_seek      = ff_pcm_read_seek,                     \
     .flags          = AVFMT_GENERIC_INDEX,                  \
     .extensions     = ext,                                  \
     .raw_codec_id   = codec,                                \
diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c
index 9c9f815e66..1886116678 100644
--- a/libavformat/rsodec.c
+++ b/libavformat/rsodec.c
@@ -94,6 +94,6 @@ AVInputFormat ff_rso_demuxer = {
     .extensions     =   "rso",
     .read_header    =   rso_read_header,
     .read_packet    =   rso_read_packet,
-    .read_seek      =   pcm_read_seek,
+    .read_seek      =   ff_pcm_read_seek,
     .codec_tag      =   (const AVCodecTag* const []){ff_codec_rso_tags, 0},
 };
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c
index 18a76ab626..f95cf8cc93 100644
--- a/libavformat/rtspdec.c
+++ b/libavformat/rtspdec.c
@@ -388,7 +388,7 @@ static int rtsp_read_close(AVFormatContext *s)
     return 0;
 }
 
-const AVClass rtsp_demuxer_class = {
+static const AVClass rtsp_demuxer_class = {
     .class_name     = "RTSP demuxer",
     .item_name      = av_default_item_name,
     .option         = ff_rtsp_options,
diff --git a/libavformat/sol.c b/libavformat/sol.c
index 700078c9cc..698502e036 100644
--- a/libavformat/sol.c
+++ b/libavformat/sol.c
@@ -147,5 +147,5 @@ AVInputFormat ff_sol_demuxer = {
     .read_probe     = sol_probe,
     .read_header    = sol_read_header,
     .read_packet    = sol_read_packet,
-    .read_seek      = pcm_read_seek,
+    .read_seek      = ff_pcm_read_seek,
 };
diff --git a/libavformat/soxdec.c b/libavformat/soxdec.c
index 282e16ec43..9ca7673175 100644
--- a/libavformat/soxdec.c
+++ b/libavformat/soxdec.c
@@ -150,5 +150,5 @@ AVInputFormat ff_sox_demuxer = {
     .read_probe     = sox_probe,
     .read_header    = sox_read_header,
     .read_packet    = sox_read_packet,
-    .read_seek      = pcm_read_seek,
+    .read_seek      = ff_pcm_read_seek,
 };
diff --git a/libavformat/voc.h b/libavformat/voc.h
index 3f995ad31f..90178b3175 100644
--- a/libavformat/voc.h
+++ b/libavformat/voc.h
@@ -45,7 +45,7 @@ typedef enum voc_type {
 extern const unsigned char ff_voc_magic[21];
 extern const AVCodecTag ff_voc_codec_tags[];
 
-int voc_get_packet(AVFormatContext *s, AVPacket *pkt,
-                   AVStream *st, int max_size);
+int ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt,
+                      AVStream *st, int max_size);
 
 #endif /* AVFORMAT_VOC_H */
diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c
index 37fd524b7f..ea06b53ecf 100644
--- a/libavformat/vocdec.c
+++ b/libavformat/vocdec.c
@@ -62,7 +62,7 @@ static int voc_read_header(AVFormatContext *s)
 }
 
 int
-voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
+ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
 {
     VocDecContext *voc = s->priv_data;
     AVCodecContext *dec = st->codec;
@@ -153,7 +153,7 @@ voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
 
 static int voc_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
-    return voc_get_packet(s, pkt, s->streams[0], 0);
+    return ff_voc_get_packet(s, pkt, s->streams[0], 0);
 }
 
 AVInputFormat ff_voc_demuxer = {
diff --git a/libavformat/wav.c b/libavformat/wav.c
index 610c792e85..3af547a30e 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -676,7 +676,7 @@ static int wav_read_seek(AVFormatContext *s,
     default:
         break;
     }
-    return pcm_read_seek(s, stream_index, timestamp, flags);
+    return ff_pcm_read_seek(s, stream_index, timestamp, flags);
 }
 
 #define OFFSET(x) offsetof(WAVContext, x)