Commit 77535bb3 authored by Paul B Mahol's avatar Paul B Mahol

bmpenc: get rid of BMPContext as it is unused

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent bd252ff6
...@@ -24,10 +24,6 @@ ...@@ -24,10 +24,6 @@
#include "avcodec.h" #include "avcodec.h"
typedef struct BMPContext {
AVFrame picture;
} BMPContext;
typedef enum { typedef enum {
BMP_RGB =0, BMP_RGB =0,
BMP_RLE8 =1, BMP_RLE8 =1,
......
...@@ -32,11 +32,6 @@ static const uint32_t rgb565_masks[] = { 0xF800, 0x07E0, 0x001F }; ...@@ -32,11 +32,6 @@ static const uint32_t rgb565_masks[] = { 0xF800, 0x07E0, 0x001F };
static const uint32_t rgb444_masks[] = { 0x0F00, 0x00F0, 0x000F }; static const uint32_t rgb444_masks[] = { 0x0F00, 0x00F0, 0x000F };
static av_cold int bmp_encode_init(AVCodecContext *avctx){ static av_cold int bmp_encode_init(AVCodecContext *avctx){
BMPContext *s = avctx->priv_data;
avcodec_get_frame_defaults(&s->picture);
avctx->coded_frame = &s->picture;
switch (avctx->pix_fmt) { switch (avctx->pix_fmt) {
case AV_PIX_FMT_BGRA: case AV_PIX_FMT_BGRA:
avctx->bits_per_coded_sample = 32; avctx->bits_per_coded_sample = 32;
...@@ -71,15 +66,14 @@ static av_cold int bmp_encode_init(AVCodecContext *avctx){ ...@@ -71,15 +66,14 @@ static av_cold int bmp_encode_init(AVCodecContext *avctx){
static int bmp_encode_frame(AVCodecContext *avctx, AVPacket *pkt, static int bmp_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *pict, int *got_packet) const AVFrame *pict, int *got_packet)
{ {
BMPContext *s = avctx->priv_data;
AVFrame * const p = &s->picture;
int n_bytes_image, n_bytes_per_row, n_bytes, i, n, hsize, ret; int n_bytes_image, n_bytes_per_row, n_bytes, i, n, hsize, ret;
const uint32_t *pal = NULL; const uint32_t *pal = NULL;
uint32_t palette256[256]; uint32_t palette256[256];
int pad_bytes_per_row, pal_entries = 0, compression = BMP_RGB; int pad_bytes_per_row, pal_entries = 0, compression = BMP_RGB;
int bit_count = avctx->bits_per_coded_sample; int bit_count = avctx->bits_per_coded_sample;
uint8_t *ptr, *buf; uint8_t *ptr, *buf;
*p = *pict; AVFrame * const p = (AVFrame *)pict;
p->pict_type= AV_PICTURE_TYPE_I; p->pict_type= AV_PICTURE_TYPE_I;
p->key_frame= 1; p->key_frame= 1;
switch (avctx->pix_fmt) { switch (avctx->pix_fmt) {
...@@ -169,7 +163,6 @@ AVCodec ff_bmp_encoder = { ...@@ -169,7 +163,6 @@ AVCodec ff_bmp_encoder = {
.name = "bmp", .name = "bmp",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_BMP, .id = AV_CODEC_ID_BMP,
.priv_data_size = sizeof(BMPContext),
.init = bmp_encode_init, .init = bmp_encode_init,
.encode2 = bmp_encode_frame, .encode2 = bmp_encode_frame,
.pix_fmts = (const enum AVPixelFormat[]){ .pix_fmts = (const enum AVPixelFormat[]){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment