Fixed StillPicture

Fixed YADIF Compile error
This commit is contained in:
jojo61 2019-10-24 16:00:09 +02:00
parent 9e8cd60f28
commit d25f456e67
2 changed files with 6 additions and 5 deletions

View File

@ -2705,7 +2705,7 @@ void StillPicture(const uint8_t * data, int size)
#ifdef STILL_DEBUG
fprintf(stderr, "still-picture\n");
#endif
for (i = 0; i < (MyVideoStream->CodecID == AV_CODEC_ID_HEVC ? 10 : 8); ++i) {
for (i = 0; i < (MyVideoStream->CodecID == AV_CODEC_ID_HEVC ? 12 : 12); ++i) {
const uint8_t *split;
int n;

View File

@ -2540,6 +2540,7 @@ int push_filters(AVCodecContext * dec_ctx,CuvidDecoder * decoder,AVFrame *frame)
int init_filters(AVCodecContext * dec_ctx,CuvidDecoder * decoder,AVFrame *frame)
{
enum AVPixelFormat format = PIXEL_FORMAT;
#ifdef VAAPI
const char *filters_descr = "deinterlace_vaapi=rate=field:auto=1"; //
#endif
@ -2547,7 +2548,7 @@ int init_filters(AVCodecContext * dec_ctx,CuvidDecoder * decoder,AVFrame *frame)
const char *filters_descr = "yadif_cuda=1:0:1"; // mode=send_field,parity=tff,deint=interlaced";
enum AVPixelFormat pix_fmts[] = { format, AV_PIX_FMT_NONE };
#endif
enum AVPixelFormat format = PIXEL_FORMAT;
char args[512];
int ret = 0;
const AVFilter *buffersrc = avfilter_get_by_name("buffer");
@ -2728,10 +2729,10 @@ static enum AVPixelFormat Cuvid_get_format(CuvidDecoder * decoder,
ist->hwaccel_output_format = AV_PIX_FMT_NV12;
}
// if ((1 || video_ctx->width != decoder->InputWidth
// || video_ctx->height != decoder->InputHeight) &&
// if ((video_ctx->width != decoder->InputWidth
// || video_ctx->height != decoder->InputHeight) && decoder->TrickSpeed == 0) {
if (decoder->TrickSpeed == 0) {
if (decoder->TrickSpeed == 0) {
#ifdef PLACEBO
VideoThreadLock();
#endif