generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

j2k/jpeg2000: merge cosmetics and whitespace

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-26 18:32:11 +02:00
parent bcf59b5d8f
commit de90bd6c3f
2 changed files with 112 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/j2kdec.c
View File

@@ -48,21 +48,21 @@ typedef struct {
Jpeg2000QuantStyle qntsty[4]; Jpeg2000QuantStyle qntsty[4];
} Jpeg2000Tile; } Jpeg2000Tile;
typedef struct { typedef struct Jpeg2000DecoderContext {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame *picture; AVFrame *picture;
GetByteContext g; GetByteContext g;
int width, height; ///< image width and height int width, height;
int image_offset_x, image_offset_y; int image_offset_x, image_offset_y;
int tile_offset_x, tile_offset_y; int tile_offset_x, tile_offset_y;
uint8_t cbps[4]; ///< bits per sample in particular components uint8_t cbps[4]; // bits per sample in particular components
uint8_t sgnd[4]; ///< if a component is signed uint8_t sgnd[4]; // if a component is signed
uint8_t properties[4]; uint8_t properties[4];
int cdx[4], cdy[4]; int cdx[4], cdy[4];
int precision; int precision;
int ncomponents; int ncomponents;
int tile_width, tile_height; ///< tile size int tile_width, tile_height;
int numXtiles, numYtiles; int numXtiles, numYtiles;
int maxtilelen; int maxtilelen;
@@ -1090,11 +1090,11 @@ static void jpeg2000_init_static_data(AVCodec *codec)
AVCodec ff_j2k_decoder = { AVCodec ff_j2k_decoder = {
.name = "j2k", .name = "j2k",
.long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"),
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_JPEG2000, .id = AV_CODEC_ID_JPEG2000,
.capabilities = CODEC_CAP_EXPERIMENTAL | CODEC_CAP_FRAME_THREADS,
.priv_data_size = sizeof(Jpeg2000DecoderContext), .priv_data_size = sizeof(Jpeg2000DecoderContext),
.init_static_data = jpeg2000_init_static_data, .init_static_data = jpeg2000_init_static_data,
.decode = decode_frame, .decode = decode_frame,
.capabilities = CODEC_CAP_EXPERIMENTAL | CODEC_CAP_FRAME_THREADS,
.long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"),
}; };