diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-23 15:03:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-23 15:03:15 +0100 |
| commit | 8e09e183fc5fbddec153e41bb8f9b30eb6e11add (patch) | |
| tree | 15ef362af8657ad573185826617e56a257cc69e3 /libavcodec/8bps.c | |
| parent | def18e5470bdcddb9d737784cc6ae427c195da7c (diff) | |
| parent | b6d7d4efae60845a93be6948ef78482bba1fc291 (diff) | |
| download | ffmpeg-8e09e183fc5fbddec153e41bb8f9b30eb6e11add.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
8bps: cosmetics
aasc: cosmetics, reformat
ansi: remove an extra return
asvdec: cosmetics, reformat
aura: cosmetics, reformat
Conflicts:
libavcodec/aasc.c
libavcodec/asvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/8bps.c')
| -rw-r--r-- | libavcodec/8bps.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c index 6d56fa67db..cfeedb108e 100644 --- a/libavcodec/8bps.c +++ b/libavcodec/8bps.c @@ -44,9 +44,6 @@ static const enum AVPixelFormat pixfmt_rgb24[] = { AV_PIX_FMT_BGR24, AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE }; -/* - * Decoder context - */ typedef struct EightBpsContext { AVCodecContext *avctx; AVFrame pic; @@ -57,12 +54,6 @@ typedef struct EightBpsContext { uint32_t pal[256]; } EightBpsContext; - -/* - * - * Decode a frame - * - */ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { @@ -151,12 +142,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, return buf_size; } - -/* - * - * Init 8BPS decoder - * - */ static av_cold int decode_init(AVCodecContext *avctx) { EightBpsContext * const c = avctx->priv_data; @@ -202,14 +187,6 @@ static av_cold int decode_init(AVCodecContext *avctx) return 0; } - - - -/* - * - * Uninit 8BPS decoder - * - */ static av_cold int decode_end(AVCodecContext *avctx) { EightBpsContext * const c = avctx->priv_data; @@ -220,8 +197,6 @@ static av_cold int decode_end(AVCodecContext *avctx) return 0; } - - AVCodec ff_eightbps_decoder = { .name = "8bps", .type = AVMEDIA_TYPE_VIDEO, |