|
|
@@ -712,40 +712,6 @@ static void video_image_display(VideoState *is) |
|
|
|
if (aspect_ratio <= 0.0) |
|
|
|
aspect_ratio = 1.0; |
|
|
|
aspect_ratio *= (float)vp->width / (float)vp->height; |
|
|
|
/* if an active format is indicated, then it overrides the |
|
|
|
mpeg format */ |
|
|
|
#if 0 |
|
|
|
if (is->video_st->codec->dtg_active_format != is->dtg_active_format) { |
|
|
|
is->dtg_active_format = is->video_st->codec->dtg_active_format; |
|
|
|
printf("dtg_active_format=%d\n", is->dtg_active_format); |
|
|
|
} |
|
|
|
#endif |
|
|
|
#if 0 |
|
|
|
switch(is->video_st->codec->dtg_active_format) { |
|
|
|
case FF_DTG_AFD_SAME: |
|
|
|
default: |
|
|
|
/* nothing to do */ |
|
|
|
break; |
|
|
|
case FF_DTG_AFD_4_3: |
|
|
|
aspect_ratio = 4.0 / 3.0; |
|
|
|
break; |
|
|
|
case FF_DTG_AFD_16_9: |
|
|
|
aspect_ratio = 16.0 / 9.0; |
|
|
|
break; |
|
|
|
case FF_DTG_AFD_14_9: |
|
|
|
aspect_ratio = 14.0 / 9.0; |
|
|
|
break; |
|
|
|
case FF_DTG_AFD_4_3_SP_14_9: |
|
|
|
aspect_ratio = 14.0 / 9.0; |
|
|
|
break; |
|
|
|
case FF_DTG_AFD_16_9_SP_14_9: |
|
|
|
aspect_ratio = 14.0 / 9.0; |
|
|
|
break; |
|
|
|
case FF_DTG_AFD_SP_4_3: |
|
|
|
aspect_ratio = 4.0 / 3.0; |
|
|
|
break; |
|
|
|
} |
|
|
|
#endif |
|
|
|
|
|
|
|
if (is->subtitle_st) |
|
|
|
{ |
|
|
|