avcodec/mpegvideo: Use enum for msmpeg4_version
Improves readability.
Signed-off-by: Andreas Rheinhardt <[email protected]>
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index f7ebb8b..50fd581 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -120,12 +120,12 @@
static AVOnce init_static_once = AV_ONCE_INIT;
switch(s->msmpeg4_version){
- case 1:
- case 2:
+ case MSMP4_V1:
+ case MSMP4_V2:
s->y_dc_scale_table=
s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
break;
- case 3:
+ case MSMP4_V3:
if(s->workaround_bugs){
s->y_dc_scale_table= ff_old_ff_y_dc_scale_table;
s->c_dc_scale_table= ff_wmv1_c_dc_scale_table;
@@ -134,14 +134,14 @@
s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table;
}
break;
- case 4:
- case 5:
+ case MSMP4_WMV1:
+ case MSMP4_WMV2:
s->y_dc_scale_table= ff_wmv1_y_dc_scale_table;
s->c_dc_scale_table= ff_wmv1_c_dc_scale_table;
break;
}
- if(s->msmpeg4_version>=4){
+ if (s->msmpeg4_version >= MSMP4_WMV1) {
ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable, ff_wmv1_scantable[1]);
ff_init_scantable(s->idsp.idct_permutation, &s->inter_scantable, ff_wmv1_scantable[0]);
ff_permute_scantable(s->permutated_intra_h_scantable, ff_wmv1_scantable[2],
@@ -218,9 +218,8 @@
b = dc_val[ - 1 - wrap];
c = dc_val[ - wrap];
- if(s->first_slice_line && (n&2)==0 && s->msmpeg4_version<4){
+ if (s->first_slice_line && !(n & 2) && s->msmpeg4_version < MSMP4_WMV1)
b=c=1024;
- }
/* XXX: the following solution consumes divisions, but it does not
necessitate to modify mpegvideo.c. The problem comes from the
@@ -259,7 +258,7 @@
#endif
/* XXX: WARNING: they did not choose the same test as MPEG-4. This
is very important ! */
- if(s->msmpeg4_version>3){
+ if (s->msmpeg4_version > MSMP4_V3) {
if(s->inter_intra_pred){
uint8_t *dest;
int wrap;
