lavc: support extracting audio service type from side data

[ffmpeg] / libavcodec / s3tc.h

diff --git a/libavcodec/s3tc.h b/libavcodec/s3tc.h
index 55615f4aa4e50692110bd3fa3fc6fa0f29e033f7..25237b95bdd5ed58af998031003e63893a63a72e 100644 (file)
--- a/libavcodec/s3tc.h
+++ b/libavcodec/s3tc.h
@@ -2,53 +2,54 @@
  * S3 Texture Compression (S3TC) decoding functions
  * Copyright (c) 2007 by Ivo van Poorten
  *
- * 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 FF_S3TC_H
-#define FF_S3TC_H
+#ifndef AVCODEC_S3TC_H
+#define AVCODEC_S3TC_H
 
 #include <stdint.h>
 
+#include "bytestream.h"
+
 #define FF_S3TC_DXT1    0x31545844
 #define FF_S3TC_DXT3    0x33545844
 
 /**
  * Decode DXT1 encoded data to RGB32
- * @param *src source buffer, has to be aligned on a 4-byte boundary
- * @param *dst destination buffer
+ * @param gb GetByteContext
+ * @param dst destination buffer
  * @param w width of output image
  * @param h height of output image
  * @param stride line size of output image
  */
-void ff_decode_dxt1(const uint8_t *src, uint8_t *dst,
+void ff_decode_dxt1(GetByteContext *gb, uint8_t *dst,
                     const unsigned int w, const unsigned int h,
                     const unsigned int stride);
 /**
  * Decode DXT3 encoded data to RGB32
- * @param *src source buffer, has to be aligned on a 4-byte boundary
- * @param *dst destination buffer
+ * @param gb GetByteContext
+ * @param dst destination buffer
  * @param w width of output image
  * @param h height of output image
  * @param stride line size of output image
  */
-void ff_decode_dxt3(const uint8_t *src, uint8_t *dst,
+void ff_decode_dxt3(GetByteContext *gb, uint8_t *dst,
                     const unsigned int w, const unsigned int h,
                     const unsigned int stride);
 
-#endif
+#endif /* AVCODEC_S3TC_H */