summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authordynaflash <[email protected]>2007-09-13 19:28:19 +0000
committerdynaflash <[email protected]>2007-09-13 19:28:19 +0000
commitbfcd060f9b555f88b01086331fb79d0ec1b8e1e2 (patch)
tree7148452f5dc8f69316e84b4aaec98c48ad1abea4 /test
parent59da0d1afd24ff1f72664ed30023f07e01e5b07d (diff)
Reverts an errant checking for from rev 960
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@961 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'test')
-rw-r--r--test/test.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/test/test.c b/test/test.c
index e1b72a974..a5ddddf25 100644
--- a/test/test.c
+++ b/test/test.c
@@ -53,7 +53,6 @@ static int abitrate = 0;
static int mux = 0;
static int acodec = 0;
static int pixelratio = 0;
-static int loosePixelratio = 0;
static int chapter_start = 0;
static int chapter_end = 0;
static int chapter_markers = 0;
@@ -448,6 +447,7 @@ static int HandleEvents( hb_handle_t * h )
job->deinterlace = deinterlace;
job->grayscale = grayscale;
+ job->pixel_ratio = pixelratio;
/* Add selected filters */
job->filters = hb_list_init();
@@ -471,16 +471,7 @@ static int HandleEvents( hb_handle_t * h )
hb_filter_denoise.settings = denoise_opt;
hb_list_add( job->filters, &hb_filter_denoise );
}
-
- if (loosePixelratio)
- {
- job->pixel_ratio = 2;
- }
- else
- {
- job->pixel_ratio = pixelratio;
- }
-
+
if( width && height )
{
job->width = width;
@@ -879,7 +870,6 @@ static void ShowHelp()
" <L:R:T:B:SB:MP> (default 1:1:4:4:0:0)\n"
" -g, --grayscale Grayscale encoding\n"
" -p, --pixelratio Store pixel aspect ratio in video stream\n"
- " -P, --loosePixelratio Store pixel aspect ratio with specified x*y\n"
"\n"
@@ -955,7 +945,6 @@ static int ParseOptions( int argc, char ** argv )
{ "detelecine", optional_argument, NULL, '9' },
{ "grayscale", no_argument, NULL, 'g' },
{ "pixelratio", no_argument, NULL, 'p' },
- { "loosePixelratio", no_argument, NULL, 'P' },
{ "width", required_argument, NULL, 'w' },
{ "height", required_argument, NULL, 'l' },
{ "crop", required_argument, NULL, 'n' },
@@ -980,7 +969,7 @@ static int ParseOptions( int argc, char ** argv )
int c;
c = getopt_long( argc, argv,
- "hvuC:f:4i:o:t:Lc:ma:6:s:UFN:e:E:2d789gpPw:l:n:b:q:S:B:r:R:Qx:TY:X:",
+ "hvuC:f:4i:o:t:Lc:ma:6:s:UFN:e:E:2d789gpw:l:n:b:q:S:B:r:R:Qx:TY:X:",
long_options, &option_index );
if( c < 0 )
{
@@ -1122,9 +1111,6 @@ static int ParseOptions( int argc, char ** argv )
case 'p':
pixelratio = 1;
break;
- case 'P':
- loosePixelratio = 1;
- break;
case 'e':
if( !strcasecmp( optarg, "ffmpeg" ) )
{