diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-03-30 02:31:55 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-04-04 22:43:25 +0000 |
| commit | 08b31a72dbcf2935e871ef7c1ffa96ae200f78aa (patch) | |
| tree | c6a2baa00a8930377a51d4036450293e67ab9d04 /libavcodec/xwdenc.c | |
| parent | 77535bb3c3762d3acfae72d6b199d5b5eba591c2 (diff) | |
| download | android_external_ffmpeg-08b31a72dbcf2935e871ef7c1ffa96ae200f78aa.tar.gz android_external_ffmpeg-08b31a72dbcf2935e871ef7c1ffa96ae200f78aa.tar.bz2 android_external_ffmpeg-08b31a72dbcf2935e871ef7c1ffa96ae200f78aa.zip | |
xwdenc: remove unused code
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/xwdenc.c')
| -rw-r--r-- | libavcodec/xwdenc.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/libavcodec/xwdenc.c b/libavcodec/xwdenc.c index fac3d0ba1f..9d0da29d0f 100644 --- a/libavcodec/xwdenc.c +++ b/libavcodec/xwdenc.c @@ -30,17 +30,8 @@ #define WINDOW_NAME "lavcxwdenc" #define WINDOW_NAME_SIZE 11 -static av_cold int xwd_encode_init(AVCodecContext *avctx) -{ - avctx->coded_frame = avcodec_alloc_frame(); - if (!avctx->coded_frame) - return AVERROR(ENOMEM); - - return 0; -} - static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, - const AVFrame *p, int *got_packet) + const AVFrame *pict, int *got_packet) { enum AVPixelFormat pix_fmt = avctx->pix_fmt; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); @@ -49,6 +40,7 @@ static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, uint32_t header_size; int i, out_size, ret; uint8_t *ptr, *buf; + AVFrame * const p = (AVFrame *)pict; pixdepth = av_get_bits_per_pixel(desc); if (desc->flags & PIX_FMT_BE) @@ -158,8 +150,8 @@ static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, return ret; buf = pkt->data; - avctx->coded_frame->key_frame = 1; - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; + p->key_frame = 1; + p->pict_type = AV_PICTURE_TYPE_I; bytestream_put_be32(&buf, header_size); bytestream_put_be32(&buf, XWD_VERSION); // file version @@ -216,20 +208,11 @@ static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, return 0; } -static av_cold int xwd_encode_close(AVCodecContext *avctx) -{ - av_freep(&avctx->coded_frame); - - return 0; -} - AVCodec ff_xwd_encoder = { .name = "xwd", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_XWD, - .init = xwd_encode_init, .encode2 = xwd_encode_frame, - .close = xwd_encode_close, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGRA, AV_PIX_FMT_RGBA, AV_PIX_FMT_ARGB, |