The code was setting aspect ratio from the DTG active format, and was present and disabled since the creation of ffplay. See thread: Subject: [FFmpeg-devel] [PATCH] Cosmetics: adopt compact notation in disabled code. Date: Sat, 12 Feb 2011 18:46:19 +0100
Unified · Split
| @@ -712,40 +712,6 @@ static void video_image_display(VideoState *is) · 711 unmodified lines | |||
| 712 | if (aspect_ratio <= 0.0) | 712 | if (aspect_ratio <= 0.0) |
| 713 | aspect_ratio = 1.0; | 713 | aspect_ratio = 1.0; |
| 714 | aspect_ratio *= (float)vp->width / (float)vp->height; | 714 | aspect_ratio *= (float)vp->width / (float)vp->height; |
| 715 | /* if an active format is indicated, then it overrides the | ||
| 716 | mpeg format */ | ||
| 717 | #if 0 | ||
| 718 | if (is->video_st->codec->dtg_active_format != is->dtg_active_format) { | ||
| 719 | is->dtg_active_format = is->video_st->codec->dtg_active_format; | ||
| 720 | printf("dtg_active_format=%d\n", is->dtg_active_format); | ||
| 721 | } | ||
| 722 | #endif | ||
| 723 | #if 0 | ||
| 724 | switch(is->video_st->codec->dtg_active_format) { | ||
| 725 | case FF_DTG_AFD_SAME: | ||
| 726 | default: | ||
| 727 | /* nothing to do */ | ||
| 728 | break; | ||
| 729 | case FF_DTG_AFD_4_3: | ||
| 730 | aspect_ratio = 4.0 / 3.0; | ||
| 731 | break; | ||
| 732 | case FF_DTG_AFD_16_9: | ||
| 733 | aspect_ratio = 16.0 / 9.0; | ||
| 734 | break; | ||
| 735 | case FF_DTG_AFD_14_9: | ||
| 736 | aspect_ratio = 14.0 / 9.0; | ||
| 737 | break; | ||
| 738 | case FF_DTG_AFD_4_3_SP_14_9: | ||
| 739 | aspect_ratio = 14.0 / 9.0; | ||
| 740 | break; | ||
| 741 | case FF_DTG_AFD_16_9_SP_14_9: | ||
| 742 | aspect_ratio = 14.0 / 9.0; | ||
| 743 | break; | ||
| 744 | case FF_DTG_AFD_SP_4_3: | ||
| 745 | aspect_ratio = 4.0 / 3.0; | ||
| 746 | break; | ||
| 747 | } | ||
| 748 | #endif | ||
| 749 | 715 | ||
| 750 | if (is->subtitle_st) | 716 | if (is->subtitle_st) |
| 751 | { | 717 | { |