summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <[email protected]>2011-02-12 18:25:53 +0100
committerMans Rullgard <[email protected]>2011-02-14 12:11:56 +0000
commitb7ec5cc4013242a9f30c429d2ce9c20ec01b03eb (patch)
treef8da23501a32f9f5a31b8cc5495ddabfa2a8c4b9
parent916dee9f45dab85cfc20b6bf63ce8722746e6508 (diff)
Remove disabled legacy code in ffplay.
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 <[email protected]>
-rw-r--r--ffplay.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/ffplay.c b/ffplay.c
index 170acfd42b..6b4f38ee35 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -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)
{