Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / dirac.h

diff --git a/libavcodec/dirac.h b/libavcodec/dirac.h
index 87d66ccab61053f248498c43d21c11f9ca8f5929..542d4910f87b3dc74c29ab944a89eeaac8c240da 100644 (file)
--- a/libavcodec/dirac.h
+++ b/libavcodec/dirac.h
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2007 Marco Gerards <marco@gnu.org>
  * Copyright (C) 2009 David Conrad
+ * Copyright (C) 2011 Jordi Ortiz
  *
  * This file is part of FFmpeg.
  *
@@ -26,6 +27,8 @@
  * @file
  * Interface to Dirac Decoder/Encoder
  * @author Marco Gerards <marco@gnu.org>
+ * @author David Conrad
+ * @author Jordi Ortiz
  */
 
 #include "avcodec.h"
@@ -51,7 +54,7 @@ typedef struct {
     uint8_t color_spec_index;       ///< index into dirac_color_spec_presets[]
 } dirac_source_params;
 
-int ff_dirac_parse_sequence_header(AVCodecContext *avctx, GetBitContext *gb,
-                                   dirac_source_params *source);
+int avpriv_dirac_parse_sequence_header(AVCodecContext *avctx, GetBitContext *gb,
+                                       dirac_source_params *source);
 
 #endif /* AVCODEC_DIRAC_H */