h263_aic is always zero for FLV and ff_mpeg1_dc_scale_table is already the default dc_scale table for both y and c. h263_aic is also always zero for the FLV decoder.
Unified · Split
| @@ -20,9 +20,7 @@ · 19 unmodified lines | |||
| 20 | 20 | ||
| 21 | #include "codec_internal.h" | 21 | #include "codec_internal.h" |
| 22 | #include "flvenc.h" | 22 | #include "flvenc.h" |
| 23 | #include "h263data.h" | ||
| 24 | #include "mpegvideo.h" | 23 | #include "mpegvideo.h" |
| 25 | #include "mpegvideodata.h" | ||
| 26 | #include "mpegvideoenc.h" | 24 | #include "mpegvideoenc.h" |
| 27 | 25 | ||
| 28 | void ff_flv_encode_picture_header(MpegEncContext *s) | 26 | void ff_flv_encode_picture_header(MpegEncContext *s) |
| @@ -63,14 +61,6 @@ void ff_flv_encode_picture_header(MpegEncContext *s) · 34 unmodified lines | |||
| 63 | put_bits(&s->pb, 1, 1); /* DeblockingFlag: on */ | 61 | put_bits(&s->pb, 1, 1); /* DeblockingFlag: on */ |
| 64 | put_bits(&s->pb, 5, s->qscale); /* Quantizer */ | 62 | put_bits(&s->pb, 5, s->qscale); /* Quantizer */ |
| 65 | put_bits(&s->pb, 1, 0); /* ExtraInformation */ | 63 | put_bits(&s->pb, 1, 0); /* ExtraInformation */ |
| 66 | |||
| 67 | if (s->h263_aic) { | ||
| 68 | s->y_dc_scale_table = | ||
| 69 | s->c_dc_scale_table = ff_aic_dc_scale_table; | ||
| 70 | } else { | ||
| 71 | s->y_dc_scale_table = | ||
| 72 | s->c_dc_scale_table = ff_mpeg1_dc_scale_table; | ||
| 73 | } | ||
| 74 | } | 64 | } |
| 75 | 65 | ||
| 76 | void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, | 66 | void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, |