libilbc: set channel layout

[ffmpeg] / libavcodec / jpegls.h

diff --git a/libavcodec/jpegls.h b/libavcodec/jpegls.h
index 792d2be3b54cebfff6d82e7e4d1a0a02a8d112ff..18c71a82d0a2e43694dbf30f6e8b26b1ab39addd 100644 (file)
--- a/libavcodec/jpegls.h
+++ b/libavcodec/jpegls.h
@@ -3,32 +3,33 @@
  * Copyright (c) 2003 Michael Niedermayer
  * Copyright (c) 2006 Konstantin Shishkov
  *
- * 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
  */
 
 /**
- * @file jpegls.h
+ * @file
  * JPEG-LS common code.
  */
 
-#ifndef FFMPEG_JPEGLS_H
-#define FFMPEG_JPEGLS_H
+#ifndef AVCODEC_JPEGLS_H
+#define AVCODEC_JPEGLS_H
 
 #include "avcodec.h"
+#include "libavutil/common.h"
 
 typedef struct JpeglsContext{
     AVCodecContext *avctx;
@@ -108,4 +109,4 @@ static inline int ff_jpegls_update_state_regular(JLSState *state, int Q, int err
 #define R(a, i   ) (bits == 8 ?  ((uint8_t*)(a))[i]    :  ((uint16_t*)(a))[i]  )
 #define W(a, i, v) (bits == 8 ? (((uint8_t*)(a))[i]=v) : (((uint16_t*)(a))[i]=v))
 
-#endif /* FFMPEG_JPEGLS_H */
+#endif /* AVCODEC_JPEGLS_H */