ape: Support _0000 files with nblock smaller than 64

[ffmpeg] / libavcodec / dirac.h

diff --git a/libavcodec/dirac.h b/libavcodec/dirac.h
index 5a53bd431e974232ccdf03ed5716affcec5b34fe..e5b79b09d2971463f1fdb0137202abc002b3e28b 100644 (file)
--- a/libavcodec/dirac.h
+++ b/libavcodec/dirac.h
@@ -2,20 +2,20 @@
  * Copyright (C) 2007 Marco Gerards <marco@gnu.org>
  * Copyright (C) 2009 David Conrad
  *
- * 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
  */
 
@@ -23,15 +23,15 @@
 #define AVCODEC_DIRAC_H
 
 /**
- * @file libavcodec/dirac.h
- * Interfaces to Dirac Decoder/Encoder
+ * @file
+ * Interface to Dirac Decoder/Encoder
  * @author Marco Gerards <marco@gnu.org>
  */
 
 #include "avcodec.h"
 #include "get_bits.h"
 
-typedef struct {
+typedef struct dirac_source_params {
     unsigned width;
     unsigned height;
     uint8_t chroma_format;          ///< 0: 444  1: 422  2: 420
@@ -51,7 +51,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 */