projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix prores pix_fmt with hw_dev probe
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
ffmpeg.C
diff --git
a/cinelerra-5.1/cinelerra/ffmpeg.C
b/cinelerra-5.1/cinelerra/ffmpeg.C
index 3bb9dd8018c9075810154bf112e3843e4677dcb9..9569de77efcd11c0979e0c2f6d93c4adf1c2cb86 100644
(file)
--- a/
cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/
cinelerra-5.1/cinelerra/ffmpeg.C
@@
-2487,7
+2487,7
@@
int FFMPEG::open_encoder(const char *type, const char *spec)
vid->height = asset->height;
vid->frame_rate = asset->frame_rate;
vid->height = asset->height;
vid->frame_rate = asset->frame_rate;
- AVPixelFormat pix_fmt =
AV_PIX_FMT_NONE
;
+ AVPixelFormat pix_fmt =
av_get_pix_fmt(asset->ff_pixel_format)
;
if( opt_hw_dev != 0 ) {
AVHWDeviceType hw_type = vid->encode_hw_activate(opt_hw_dev);
switch( hw_type ) {
if( opt_hw_dev != 0 ) {
AVHWDeviceType hw_type = vid->encode_hw_activate(opt_hw_dev);
switch( hw_type ) {
@@
-2495,9
+2495,7
@@
int FFMPEG::open_encoder(const char *type, const char *spec)
pix_fmt = AV_PIX_FMT_VAAPI;
break;
case AV_HWDEVICE_TYPE_NONE:
pix_fmt = AV_PIX_FMT_VAAPI;
break;
case AV_HWDEVICE_TYPE_NONE:
- default:
- pix_fmt = av_get_pix_fmt(asset->ff_pixel_format);
- break;
+ default: break;
}
}
if( pix_fmt == AV_PIX_FMT_NONE )
}
}
if( pix_fmt == AV_PIX_FMT_NONE )