Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / pcm.c

diff --git a/libavformat/pcm.c b/libavformat/pcm.c
index d66be59ccb8f30702f6b2db7000aa1e8bbd4ca0e..bba741de5323a53cb468c6c5ddcc676f152e37c3 100644 (file)
--- 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;