X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fxiph.h;h=afaece7cee9ed804a238b89aa75ec410a41aec13;hb=ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79;hp=7e75750107ee27d60848bbc4df62a2e7c56c4c09;hpb=5b21bdabe43611385d1d55a21d5b1f607b133d29;p=ffmpeg

diff --git a/libavcodec/xiph.h b/libavcodec/xiph.h
index 7e75750107e..afaece7cee9 100644
--- a/libavcodec/xiph.h
+++ b/libavcodec/xiph.h
@@ -1,30 +1,30 @@
 /*
- * Copyright (C) 2007  FFmpeg Project
+ * Copyright (C) 2007  Libav Project
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_XIPH_H
-#define FFMPEG_XIPH_H
+#ifndef AVCODEC_XIPH_H
+#define AVCODEC_XIPH_H
 
-#include "common.h"
+#include "libavutil/common.h"
 
 /**
- * Splits a single extradata buffer into the three headers that most
+ * Split a single extradata buffer into the three headers that most
  * Xiph codecs use. (e.g. Theora and Vorbis)
  * Works both with Matroska's packing and lavc's packing.
  *
@@ -36,8 +36,8 @@
  * @param[out] header_len The sizes of each of the three headers.
  * @return On error a negative value is returned, on success zero.
  */
-int ff_split_xiph_headers(uint8_t *extradata, int extradata_size,
-                          int first_header_size, uint8_t *header_start[3],
-                          int header_len[3]);
+int avpriv_split_xiph_headers(uint8_t *extradata, int extradata_size,
+                              int first_header_size, uint8_t *header_start[3],
+                              int header_len[3]);
 
-#endif /* FFMPEG_XIPH_H */
+#endif /* AVCODEC_XIPH_H */