add binfolder path relative filters, fix gbrp color model, vwdw timebar tweaks, title...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / ffmpeg.C

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 541c5f0a4cd0bc4a4ec809408e930076ad2f1177..a18ae88cae0e356847edad989b3935752b008b79 100644 (file)
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -1114,6 +1114,7 @@ int FFVideoConvert::convert_picture_vframe(VFrame *frame, AVFrame *ip, AVFrame *
        case BC_YUV422P:
                usz /= 2;
        case BC_YUV444P:
+       case BC_GBRP:
                // override av_image_fill_arrays() for planar types
                ipic->data[0] = frame->get_y();  ipic->linesize[0] = ysz;
                ipic->data[1] = frame->get_u();  ipic->linesize[1] = usz;
@@ -1214,6 +1215,7 @@ int FFVideoConvert::convert_vframe_picture(VFrame *frame, AVFrame *op, AVFrame *
        case BC_YUV422P:
                usz /= 2;
        case BC_YUV444P:
+       case BC_GBRP:
                // override av_image_fill_arrays() for planar types
                opic->data[0] = frame->get_y();  opic->linesize[0] = ysz;
                opic->data[1] = frame->get_u();  opic->linesize[1] = usz;
@@ -2992,6 +2994,7 @@ int FFMPEG::scan(IndexState *index_state, int64_t *scan_position, int *canceled)
        if( !frame ) {
                fprintf(stderr,"FFMPEG::scan: ");
                fprintf(stderr,_("av_frame_alloc failed\n"));
+               fprintf(stderr,"FFMPEG::scan:file=%s\n", file_base->asset->path);
                return -1;
        }
 
@@ -3037,6 +3040,7 @@ int FFMPEG::scan(IndexState *index_state, int64_t *scan_position, int *canceled)
                }
                fprintf(stderr,"FFMPEG::scan: ");
                fprintf(stderr,_("codec open failed\n"));
+               fprintf(stderr,"FFMPEG::scan:file=%s\n", file_base->asset->path);
                avcodec_free_context(&avctx);
        }