diff options
author | Clément Bœsch <ubitux@gmail.com> | 2013-03-17 03:44:14 +0100 |
---|---|---|
committer | Clément Bœsch <ubitux@gmail.com> | 2013-03-17 04:38:28 +0100 |
commit | 3313b9cc2d673f7943ce54a8ca4fd533ed03e286 (patch) | |
tree | 9a0edb6f32919f9b104aac3e13de6a222056e245 /libavcodec | |
parent | 286153ea48618fd2287a5e26610729c1f9e83793 (diff) | |
download | ffmpeg-3313b9cc2d673f7943ce54a8ca4fd533ed03e286.tar.gz |
lavc: remove unecessary a64enc include.
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/a64enc.h | 58 | ||||
-rw-r--r-- | libavcodec/a64multienc.c | 26 |
2 files changed, 25 insertions, 59 deletions
diff --git a/libavcodec/a64enc.h b/libavcodec/a64enc.h deleted file mode 100644 index 28959953ad..0000000000 --- a/libavcodec/a64enc.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * a64 video encoder - basic headers - * Copyright (c) 2009 Tobias Bindhammer - * - * This file is part of FFmpeg. - * - * 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. - * - * 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 FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * a64 video encoder - basic headers - */ - -#ifndef AVCODEC_A64ENC_H -#define AVCODEC_A64ENC_H - -#include "libavutil/lfg.h" -#include "avcodec.h" - -#define C64XRES 320 -#define C64YRES 200 - -typedef struct A64Context { - /* general variables */ - AVFrame picture; - - /* variables for multicolor modes */ - AVLFG randctx; - int mc_lifetime; - int mc_use_5col; - unsigned mc_frame_counter; - int *mc_meta_charset; - int *mc_charmap; - int *mc_best_cb; - int mc_luma_vals[5]; - uint8_t *mc_charset; - uint8_t *mc_colram; - uint8_t *mc_palette; - int mc_pal_size; - - /* pts of the next packet that will be output */ - int64_t next_pts; -} A64Context; - -#endif /* AVCODEC_A64ENC_H */ diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c index 0f6cc7636a..eaf7b46b55 100644 --- a/libavcodec/a64multienc.c +++ b/libavcodec/a64multienc.c @@ -24,7 +24,6 @@ * a64 video encoder - multicolor modes */ -#include "a64enc.h" #include "a64colors.h" #include "a64tables.h" #include "elbg.h" @@ -37,6 +36,31 @@ #define INTERLACED 1 #define CROP_SCREENS 1 +#define C64XRES 320 +#define C64YRES 200 + +typedef struct A64Context { + /* general variables */ + AVFrame picture; + + /* variables for multicolor modes */ + AVLFG randctx; + int mc_lifetime; + int mc_use_5col; + unsigned mc_frame_counter; + int *mc_meta_charset; + int *mc_charmap; + int *mc_best_cb; + int mc_luma_vals[5]; + uint8_t *mc_charset; + uint8_t *mc_colram; + uint8_t *mc_palette; + int mc_pal_size; + + /* pts of the next packet that will be output */ + int64_t next_pts; +} A64Context; + /* gray gradient */ static const int mc_colors[5]={0x0,0xb,0xc,0xf,0x1}; |