Commit 4116b2b1 authored by Davinder Singh's avatar Davinder Singh Committed by Michael Niedermayer

avcodec/mjpegenc: cosmetic changes

Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 1939b903
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include "mjpeg.h" #include "mjpeg.h"
#include "mjpegenc.h" #include "mjpegenc.h"
static int alloc_huffman(MpegEncContext *s) static int alloc_huffman(MpegEncContext *s)
{ {
MJpegContext *m = s->mjpeg_ctx; MJpegContext *m = s->mjpeg_ctx;
...@@ -351,7 +350,6 @@ void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[12][64]) ...@@ -351,7 +350,6 @@ void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[12][64])
#define V_MAX 2 #define V_MAX 2
static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *pic_arg, int *got_packet) const AVFrame *pic_arg, int *got_packet)
{ {
MpegEncContext *s = avctx->priv_data; MpegEncContext *s = avctx->priv_data;
AVFrame *pic; AVFrame *pic;
...@@ -405,7 +403,6 @@ FF_MPV_COMMON_OPTS ...@@ -405,7 +403,6 @@ FF_MPV_COMMON_OPTS
}; };
#if CONFIG_MJPEG_ENCODER #if CONFIG_MJPEG_ENCODER
static const AVClass mjpeg_class = { static const AVClass mjpeg_class = {
.class_name = "mjpeg encoder", .class_name = "mjpeg encoder",
.item_name = av_default_item_name, .item_name = av_default_item_name,
...@@ -423,12 +420,13 @@ AVCodec ff_mjpeg_encoder = { ...@@ -423,12 +420,13 @@ AVCodec ff_mjpeg_encoder = {
.encode2 = ff_mpv_encode_picture, .encode2 = ff_mpv_encode_picture,
.close = ff_mpv_encode_end, .close = ff_mpv_encode_end,
.capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY,
.pix_fmts = (const enum AVPixelFormat[]){ .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE
}, },
.priv_class = &mjpeg_class, .priv_class = &mjpeg_class,
}; };
#endif #endif
#if CONFIG_AMV_ENCODER #if CONFIG_AMV_ENCODER
static const AVClass amv_class = { static const AVClass amv_class = {
.class_name = "amv encoder", .class_name = "amv encoder",
...@@ -446,7 +444,7 @@ AVCodec ff_amv_encoder = { ...@@ -446,7 +444,7 @@ AVCodec ff_amv_encoder = {
.init = ff_mpv_encode_init, .init = ff_mpv_encode_init,
.encode2 = amv_encode_picture, .encode2 = amv_encode_picture,
.close = ff_mpv_encode_end, .close = ff_mpv_encode_end,
.pix_fmts = (const enum AVPixelFormat[]){ .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NONE AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NONE
}, },
.priv_class = &amv_class, .priv_class = &amv_class,
......
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