virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Code Issues Releases Activity

Dirac: Specific struct initializers in AVCodec initialization

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Jordi Ortiz 2011-11-03 19:21:32 +01:00 committed by Michael Niedermayer
parent aae7a5e36d
commit fca712df09
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/diracdec.c
View File

@ -744,7 +744,7 @@ static void decode_lowdelay(DiracContext *s)
for (slice_y = 0; bufsize > 0 && slice_y < s->lowdelay.num_y; slice_y++) for (slice_y = 0; bufsize > 0 && slice_y < s->lowdelay.num_y; slice_y++)
for (slice_x = 0; bufsize > 0 && slice_x < s->lowdelay.num_x; slice_x++) { for (slice_x = 0; bufsize > 0 && slice_x < s->lowdelay.num_x; slice_x++) {
bytes = (slice_num+1) * s->lowdelay.bytes.num / s->lowdelay.bytes.den bytes = (slice_num+1) * s->lowdelay.bytes.num / s->lowdelay.bytes.den
- slice_num * s->lowdelay.bytes.num / s->lowdelay.bytes.den; - slice_num * s->lowdelay.bytes.num / s->lowdelay.bytes.den;
slices[slice_num].bytes = bytes; slices[slice_num].bytes = bytes;
slices[slice_num].slice_x = slice_x; slices[slice_num].slice_x = slice_x;
@ -830,8 +830,7 @@ static int dirac_unpack_prediction_parameters(DiracContext *s)
/* Luma and Chroma are equal. 11.2.3 */ /* Luma and Chroma are equal. 11.2.3 */
idx = svq3_get_ue_golomb(gb); /* [DIRAC_STD] index */ idx = svq3_get_ue_golomb(gb); /* [DIRAC_STD] index */
if (idx > 4) if (idx > 4) {
{
av_log(s->avctx, AV_LOG_ERROR, "Block prediction index too high\n"); av_log(s->avctx, AV_LOG_ERROR, "Block prediction index too high\n");
return -1; return -1;
} }
@ -1893,15 +1892,15 @@ static int dirac_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
} }
AVCodec ff_dirac_decoder = { AVCodec ff_dirac_decoder = {
"dirac", .name = "dirac",
AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
CODEC_ID_DIRAC, .id = CODEC_ID_DIRAC,
sizeof(DiracContext), .priv_data_size = sizeof(DiracContext),
dirac_decode_init, .init = dirac_decode_init,
NULL, .encode = NULL,
dirac_decode_end, .close = dirac_decode_end,
dirac_decode_frame, .decode = dirac_decode_frame,
CODEC_CAP_DELAY, .capabilities = CODEC_CAP_DELAY,
.flush = dirac_decode_flush, .flush = dirac_decode_flush,
.long_name = NULL_IF_CONFIG_SMALL("BBC Dirac VC-2"), .long_name = NULL_IF_CONFIG_SMALL("BBC Dirac VC-2"),
}; };