From c47bb1ffbe630609fda9bd7c9488bae7f0078a4e Mon Sep 17 00:00:00 2001 From: Loren Merritt Date: Sat, 5 Mar 2005 00:37:25 +0000 Subject: [PATCH] report version number in decimal instead of hex git-svn-id: svn://svn.videolan.org/x264/trunk@151 df754926-b1dd-0310-bc7b-ec298dee348c --- encoder/encoder.c | 2 +- encoder/set.c | 2 +- x264.c | 2 +- x264.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/encoder/encoder.c b/encoder/encoder.c index 70b57a20..1e7552cd 100644 --- a/encoder/encoder.c +++ b/encoder/encoder.c @@ -380,7 +380,7 @@ x264_t *x264_encoder_open ( x264_param_t *param ) h->param.i_bframe = x264_clip3( h->param.i_bframe, 0, X264_BFRAME_MAX ); h->param.i_bframe_bias = x264_clip3( h->param.i_bframe_bias, -90, 100 ); - h->param.b_bframe_pyramid = h->param.b_bframe_pyramid && h->param.i_bframe; + h->param.b_bframe_pyramid = h->param.b_bframe_pyramid && h->param.i_bframe > 1; h->frames.i_delay = h->param.i_bframe; h->frames.i_max_ref0 = h->param.i_frame_reference; h->frames.i_max_ref1 = h->param.b_bframe_pyramid ? 2 diff --git a/encoder/set.c b/encoder/set.c index f6e1b879..3fdca53f 100644 --- a/encoder/set.c +++ b/encoder/set.c @@ -379,7 +379,7 @@ void x264_sei_version_write( bs_t *s ) }; char version[256]; int length; - sprintf( version, "x264 - core 0x%x - H.264/MPEG-4 AVC codec - Copyleft 2005 - http://www.videolan.org/x264.html", + sprintf( version, "x264 - core %d - H.264/MPEG-4 AVC codec - Copyleft 2005 - http://www.videolan.org/x264.html", X264_BUILD ); length = strlen(version)+1+16; diff --git a/x264.c b/x264.c index 85dda950..d031eac2 100644 --- a/x264.c +++ b/x264.c @@ -98,7 +98,7 @@ int main( int argc, char **argv ) static void Help( x264_param_t *defaults ) { fprintf( stderr, - "x264 build:0x%4.4x\n" + "x264 build:%d\n" "Syntax: x264 [options] [-o out.h26l] in.yuv widthxheigh\n" "\n" " -h, --help Print this help\n" diff --git a/x264.h b/x264.h index c4df9220..b15b806b 100644 --- a/x264.h +++ b/x264.h @@ -26,7 +26,7 @@ #include -#define X264_BUILD 0x0014 +#define X264_BUILD 20 /* x264_t: * opaque handler for decoder and encoder */ -- 2.40.0