generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove disabled legacy code in ffplay.

Browse Source 
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

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit b7ec5cc4013242a9f30c429d2ce9c20ec01b03eb)
This commit is contained in:
Stefano Sabatini 2011-02-12 18:25:53 +01:00 committed by Michael Niedermayer
parent 4a7d992437
commit 9d375bf5ec
1 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ffplay.c
View File

@ -710,40 +710,6 @@ static void video_image_display(VideoState *is)
if (aspect_ratio <= 0.0) if (aspect_ratio <= 0.0)
aspect_ratio = 1.0; aspect_ratio = 1.0;
aspect_ratio *= (float)vp->width / (float)vp->height; 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) if (is->subtitle_st)
{ {