Fixes compilation error on Windows/Visual Studio
Change-Id: I32377deb5f1e882370c70449cb8f68f2fdafcbef
This commit is contained in:
Родитель
750955b4c1
Коммит
59622cf292
28
aomenc.c
28
aomenc.c
|
@ -1964,6 +1964,7 @@ int main(int argc, const char **argv_) {
|
|||
{ stream->config.cfg.g_input_bit_depth = input.bit_depth; });
|
||||
}
|
||||
|
||||
#if CONFIG_AOM_HIGHBITDEPTH
|
||||
FOREACH_STREAM({
|
||||
if (input.fmt != AOM_IMG_FMT_I420 && input.fmt != AOM_IMG_FMT_I42016) {
|
||||
/* Automatically upgrade if input is non-4:2:0 but a 4:2:0 profile
|
||||
|
@ -1980,7 +1981,6 @@ int main(int argc, const char **argv_) {
|
|||
default: break;
|
||||
}
|
||||
}
|
||||
#if CONFIG_AOM_HIGHBITDEPTH
|
||||
/* Automatically set the codec bit depth to match the input bit depth.
|
||||
* Upgrade the profile if required. */
|
||||
if (stream->config.cfg.g_input_bit_depth >
|
||||
|
@ -2003,7 +2003,6 @@ int main(int argc, const char **argv_) {
|
|||
if (stream->config.cfg.g_profile > 1) {
|
||||
stream->config.use_16bit_internal = 1;
|
||||
}
|
||||
#endif
|
||||
if (profile_updated) {
|
||||
fprintf(stderr,
|
||||
"Warning: automatically upgrading to profile %d to "
|
||||
|
@ -2011,6 +2010,31 @@ int main(int argc, const char **argv_) {
|
|||
stream->config.cfg.g_profile);
|
||||
}
|
||||
});
|
||||
#else
|
||||
FOREACH_STREAM({
|
||||
if (input.fmt != AOM_IMG_FMT_I420 && input.fmt != AOM_IMG_FMT_I42016) {
|
||||
/* Automatically upgrade if input is non-4:2:0 but a 4:2:0 profile
|
||||
was selected. */
|
||||
switch (stream->config.cfg.g_profile) {
|
||||
case 0:
|
||||
stream->config.cfg.g_profile = 1;
|
||||
profile_updated = 1;
|
||||
break;
|
||||
case 2:
|
||||
stream->config.cfg.g_profile = 3;
|
||||
profile_updated = 1;
|
||||
break;
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
if (profile_updated) {
|
||||
fprintf(stderr,
|
||||
"Warning: automatically upgrading to profile %d to "
|
||||
"match input format.\n",
|
||||
stream->config.cfg.g_profile);
|
||||
}
|
||||
});
|
||||
#endif
|
||||
|
||||
FOREACH_STREAM(set_stream_dimensions(stream, input.width, input.height));
|
||||
FOREACH_STREAM(validate_stream_config(stream, &global));
|
||||
|
|
Загрузка…
Ссылка в новой задаче