projects
/
goodguy
/
history.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9946e71
)
fix ffmpeg w/h setup
author
Good Guy
<good1.2guy@gmail.com>
Tue, 23 Jan 2018 03:53:42 +0000
(20:53 -0700)
committer
Good Guy
<good1.2guy@gmail.com>
Tue, 23 Jan 2018 03:53:42 +0000
(20:53 -0700)
cinelerra-5.1/cinelerra/ffmpeg.C
patch
|
blob
|
history
diff --git
a/cinelerra-5.1/cinelerra/ffmpeg.C
b/cinelerra-5.1/cinelerra/ffmpeg.C
index 9f87bc18daf45681110416c71864e5b684adb3aa..167ee479ae98252d0cf6b08342df22e4d43773bc 100644
(file)
--- a/
cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/
cinelerra-5.1/cinelerra/ffmpeg.C
@@
-2085,9
+2085,9
@@
int FFMPEG::open_encoder(const char *type, const char *spec)
ctx->pix_fmt = pix_fmt;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
int mask_w = (1<<desc->log2_chroma_w)-1;
ctx->pix_fmt = pix_fmt;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
int mask_w = (1<<desc->log2_chroma_w)-1;
-
if( mask_w > 0 )
ctx->width = (vid->width+mask_w) & ~mask_w;
+ ctx->width = (vid->width+mask_w) & ~mask_w;
int mask_h = (1<<desc->log2_chroma_h)-1;
int mask_h = (1<<desc->log2_chroma_h)-1;
-
if( mask_h > 0 )
ctx->height = (vid->height+mask_h) & ~mask_h;
+ ctx->height = (vid->height+mask_h) & ~mask_h;
ctx->sample_aspect_ratio = to_sample_aspect_ratio(asset);
AVRational frame_rate = check_frame_rate(codec, vid->frame_rate);
if( !frame_rate.num || !frame_rate.den ) {
ctx->sample_aspect_ratio = to_sample_aspect_ratio(asset);
AVRational frame_rate = check_frame_rate(codec, vid->frame_rate);
if( !frame_rate.num || !frame_rate.den ) {