X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fbdwrite.C;fp=cinelerra-5.1%2Fcinelerra%2Fbdwrite.C;h=56b0b3f795f8b21977f51df36ba3c7204df88805;hb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;hp=a26d56aa796f416fbb037090e6dc10446c96b70d;hpb=5a1b2bb96f2bd6b7ef4f8031763683726c02219d;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/bdwrite.C b/cinelerra-5.1/cinelerra/bdwrite.C index a26d56aa..56b0b3f7 100644 --- a/cinelerra-5.1/cinelerra/bdwrite.C +++ b/cinelerra-5.1/cinelerra/bdwrite.C @@ -135,7 +135,7 @@ enum { BLURAY_AUDIO_FORMAT_MONO = 1, BLURAY_AUDIO_FORMAT_STEREO = 3, BLURAY_AUDIO_FORMAT_MULTI_CHAN = 6, - BLURAY_AUDIO_FORMAT_COMBO = 12, // Stereo ac3/dts, + BLURAY_AUDIO_FORMAT_COMBO = 12, // Stereo ac3/dts, BLURAY_AUDIO_RATE_48 = 1, BLURAY_AUDIO_RATE_96 = 4, @@ -1345,7 +1345,7 @@ pb_obj::set_bdj(char *nm, int pt) bdj_name = cstrdup(nm); } -void +void pb_obj::write_hdmv_obj(int id_ref) { bs.write(pb_typ, 2); @@ -2453,7 +2453,7 @@ static int bd_aspect_ratio(int w, int h, double ratio) double aspect = (w * ratio) / h; if( fabs(aspect-1.333) < 0.01 ) return BLURAY_ASPECT_RATIO_4_3; if( fabs(aspect-1.777) < 0.01 ) return BLURAY_ASPECT_RATIO_16_9; - return w == 720 ? BLURAY_ASPECT_RATIO_4_3 : BLURAY_ASPECT_RATIO_16_9; + return w == 720 ? BLURAY_ASPECT_RATIO_4_3 : BLURAY_ASPECT_RATIO_16_9; fprintf(stderr, "unknown bluray aspect ratio %5.3f\n",aspect); exit(1); } @@ -2676,7 +2676,7 @@ Media::compose() mp->cmds.append(cmd); mov.movies.append(mp); // BREAK - + for( int ii=0; iiresume_intention_flag = 1;