mirror of https://git.ffmpeg.org/ffmpeg.git
j2k/jpeg2000: merge cosmetics and whitespace
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
bcf59b5d8f
commit
de90bd6c3f
|
@ -48,21 +48,21 @@ typedef struct {
|
|||
Jpeg2000QuantStyle qntsty[4];
|
||||
} Jpeg2000Tile;
|
||||
|
||||
typedef struct {
|
||||
typedef struct Jpeg2000DecoderContext {
|
||||
AVCodecContext *avctx;
|
||||
AVFrame *picture;
|
||||
GetByteContext g;
|
||||
|
||||
int width, height; ///< image width and height
|
||||
int width, height;
|
||||
int image_offset_x, image_offset_y;
|
||||
int tile_offset_x, tile_offset_y;
|
||||
uint8_t cbps[4]; ///< bits per sample in particular components
|
||||
uint8_t sgnd[4]; ///< if a component is signed
|
||||
uint8_t cbps[4]; // bits per sample in particular components
|
||||
uint8_t sgnd[4]; // if a component is signed
|
||||
uint8_t properties[4];
|
||||
int cdx[4], cdy[4];
|
||||
int precision;
|
||||
int ncomponents;
|
||||
int tile_width, tile_height; ///< tile size
|
||||
int tile_width, tile_height;
|
||||
int numXtiles, numYtiles;
|
||||
int maxtilelen;
|
||||
|
||||
|
@ -1090,11 +1090,11 @@ static void jpeg2000_init_static_data(AVCodec *codec)
|
|||
|
||||
AVCodec ff_j2k_decoder = {
|
||||
.name = "j2k",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"),
|
||||
.type = AVMEDIA_TYPE_VIDEO,
|
||||
.id = AV_CODEC_ID_JPEG2000,
|
||||
.capabilities = CODEC_CAP_EXPERIMENTAL | CODEC_CAP_FRAME_THREADS,
|
||||
.priv_data_size = sizeof(Jpeg2000DecoderContext),
|
||||
.init_static_data = jpeg2000_init_static_data,
|
||||
.decode = decode_frame,
|
||||
.capabilities = CODEC_CAP_EXPERIMENTAL | CODEC_CAP_FRAME_THREADS,
|
||||
.long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"),
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue