summaryrefslogtreecommitdiff
path: root/libavcodec/hqx.h
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/hqx.h')
-rw-r--r--libavcodec/hqx.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/libavcodec/hqx.h b/libavcodec/hqx.h
index f35721a06c..42d382de1f 100644
--- a/libavcodec/hqx.h
+++ b/libavcodec/hqx.h
@@ -1,20 +1,20 @@
/*
* Canopus HQX decoder
*
- * This file is part of Libav.
+ * This file is part of FFmpeg.
*
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg 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.
*
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg 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 Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -25,10 +25,8 @@
#include "libavutil/frame.h"
#include "libavutil/mem.h"
-
-#include "bitstream.h"
+#include "get_bits.h"
#include "hqxdsp.h"
-#include "vlc.h"
enum HQXACMode {
HQX_AC_Q0 = 0,
@@ -57,7 +55,7 @@ typedef int (*mb_decode_func)(struct HQXContext *ctx,
int slice_no, int x, int y);
typedef struct HQXSlice {
- BitstreamContext bc;
+ GetBitContext gb;
DECLARE_ALIGNED(16, int16_t, block)[16][64];
} HQXSlice;