The timebase update fixes Issue #61.
Unified · Split
| @@ -538,7 +538,7 @@ void Ebml_Serialize(EbmlGlobal *glob, const void *buffer_in, int buffer_size, un · 537 unmodified lines | |||
| 538 | } | 538 | } |
| 539 | #undef WRITE_BUFFER | 539 | #undef WRITE_BUFFER |
| 540 | 540 | ||
| 541 | /* Need a fixed size serializer for the track ID. libmkv provdes a 64 bit | 541 | /* Need a fixed size serializer for the track ID. libmkv provides a 64 bit |
| 542 | * one, but not a 32 bit one. | 542 | * one, but not a 32 bit one. |
| 543 | */ | 543 | */ |
| 544 | static void Ebml_SerializeUnsigned32(EbmlGlobal *glob, unsigned long class_id, uint64_t ui) | 544 | static void Ebml_SerializeUnsigned32(EbmlGlobal *glob, unsigned long class_id, uint64_t ui) |
| @@ -555,7 +555,7 @@ Ebml_StartSubElement(EbmlGlobal *glob, EbmlLoc *ebmlLoc, · 10 unmodified lines | |||
| 555 | unsigned long class_id) | 555 | unsigned long class_id) |
| 556 | { | 556 | { |
| 557 | //todo this is always taking 8 bytes, this may need later optimization | 557 | //todo this is always taking 8 bytes, this may need later optimization |
| 558 | //this is a key that says lenght unknown | 558 | //this is a key that says length unknown |
| 559 | uint64_t unknownLen = LITERALU64(0x01FFFFFFFFFFFFFF); | 559 | uint64_t unknownLen = LITERALU64(0x01FFFFFFFFFFFFFF); |
| 560 | 560 | ||
| 561 | Ebml_WriteID(glob, class_id); | 561 | Ebml_WriteID(glob, class_id); |
| @@ -971,7 +971,7 @@ static const struct arg_enum_list stereo_mode_enum[] = { · 409 unmodified lines | |||
| 971 | static const arg_def_t stereo_mode = ARG_DEF_ENUM(NULL, "stereo-mode", 1, | 971 | static const arg_def_t stereo_mode = ARG_DEF_ENUM(NULL, "stereo-mode", 1, |
| 972 | "Stereo 3D video format", stereo_mode_enum); | 972 | "Stereo 3D video format", stereo_mode_enum); |
| 973 | static const arg_def_t timebase = ARG_DEF(NULL, "timebase", 1, | 973 | static const arg_def_t timebase = ARG_DEF(NULL, "timebase", 1, |
| 974 | "Stream timebase (frame duration)"); | 974 | "Stream timebase (see below)"); |
| 975 | static const arg_def_t error_resilient = ARG_DEF(NULL, "error-resilient", 1, | 975 | static const arg_def_t error_resilient = ARG_DEF(NULL, "error-resilient", 1, |
| 976 | "Enable error resiliency features"); | 976 | "Enable error resiliency features"); |
| 977 | static const arg_def_t lag_in_frames = ARG_DEF(NULL, "lag-in-frames", 1, | 977 | static const arg_def_t lag_in_frames = ARG_DEF(NULL, "lag-in-frames", 1, |
| @@ -1127,6 +1127,9 @@ static void usage_exit() · 149 unmodified lines | |||
| 1127 | fprintf(stderr, "\nVP8 Specific Options:\n"); | 1127 | fprintf(stderr, "\nVP8 Specific Options:\n"); |
| 1128 | arg_show_usage(stdout, vp8_args); | 1128 | arg_show_usage(stdout, vp8_args); |
| 1129 | #endif | 1129 | #endif |
| 1130 | fprintf(stderr, "\nStream timebase (--timebase):\n" | ||
| 1131 | " This is the unit of time used to represent frame timestamps,\n" | ||
| 1132 | " in fractional seconds. Default is 1/1000.\n"); | ||
| 1130 | fprintf(stderr, "\n" | 1133 | fprintf(stderr, "\n" |
| 1131 | "Included encoders:\n" | 1134 | "Included encoders:\n" |
| 1132 | "\n"); | 1135 | "\n"); |
| @@ -1165,7 +1168,7 @@ static int merge_hist_buckets(struct hist_bucket *bucket, · 32 unmodified lines | |||
| 1165 | big_bucket = i; | 1168 | big_bucket = i; |
| 1166 | } | 1169 | } |
| 1167 | 1170 | ||
| 1168 | /* If we have too many buckets, merge the smallest with an ajacent | 1171 | /* If we have too many buckets, merge the smallest with an adjacent |
| 1169 | * bucket. | 1172 | * bucket. |
| 1170 | */ | 1173 | */ |
| 1171 | while(buckets > max_buckets) | 1174 | while(buckets > max_buckets) |