diff options
| author | jbrjake <[email protected]> | 2009-01-26 18:44:27 +0000 |
|---|---|---|
| committer | jbrjake <[email protected]> | 2009-01-26 18:44:27 +0000 |
| commit | a886670f9477c883d3502e24b4ca31efa0db9676 (patch) | |
| tree | e9b7b1447ff4c8f974a17f79ac708a62e16a3e44 /libhb/muxavi.c | |
| parent | c3cbf601deb9a119809d1c63b0e067346ad4970a (diff) | |
Organizes anamorphic parameters in a struct, requiring some minor search and replace changes in the interfaces. Folds the logic for strict anamorphic mode into hb_set_anamorphic_size() and also stakes out a new, more customizable mode 3.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2097 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/muxavi.c')
| -rw-r--r-- | libhb/muxavi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libhb/muxavi.c b/libhb/muxavi.c index 70d22f522..913e84508 100644 --- a/libhb/muxavi.c +++ b/libhb/muxavi.c @@ -394,7 +394,7 @@ static int AVIInit( hb_mux_object_t * m ) #define g mux_data->vprp_header /* Vprp video stream header */ - AVRational sample_aspect_ratio = ( AVRational ){ job->pixel_aspect_width, job->pixel_aspect_height }; + AVRational sample_aspect_ratio = ( AVRational ){ job->anamorphic.par_width, job->anamorphic.par_height }; AVRational dar = av_mul_q( sample_aspect_ratio, ( AVRational ){ job->width, job->height } ); int num, den; av_reduce(&num, &den, dar.num, dar.den, 0xFFFF); @@ -490,7 +490,7 @@ static int AVIInit( hb_mux_object_t * m ) /* video strf */ sizeof( hb_bitmap_info_t ) + /* video vprp */ - ( job->pixel_ratio ? sizeof( hb_avi_vprp_info_t ) : 0 ) + + ( job->anamorphic.mode ? sizeof( hb_avi_vprp_info_t ) : 0 ) + /* audios strf */ audio_count * ( sizeof( hb_wave_formatex_t ) + ( is_ac3 ? 0 : sizeof( hb_wave_mp3_t ) ) ); @@ -513,11 +513,11 @@ static int AVIInit( hb_mux_object_t * m ) WriteInt32( m->file, FOURCC( "LIST" ) ); WriteInt32( m->file, 4 + sizeof( hb_avi_stream_header_t ) + sizeof( hb_bitmap_info_t ) + - ( job->pixel_ratio ? sizeof( hb_avi_vprp_info_t ) : 0 ) ); + ( job->anamorphic.mode ? sizeof( hb_avi_vprp_info_t ) : 0 ) ); WriteInt32( m->file, FOURCC( "strl" ) ); WriteStreamHeader( m->file, &mux_data->header ); WriteBitmapInfo( m->file, &mux_data->format.v ); - if( job->pixel_ratio ) + if( job->anamorphic.mode ) { WriteVprpInfo( m->file, &mux_data->vprp_header ); } |