tweak zoom/fullscr to remember cwdw scale after fullscr

[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 70098ca189c5267b3aeea8bfdb9de8ea19f051ff..794added52ba6e9519ccd06f45f96dec2ad6de0f 100644 (file)
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -1031,7 +1031,8 @@ AVHWDeviceType FFVideoStream::decode_hw_activate()
        const char *hw_dev = ffmpeg->opt_hw_dev;
        if( !hw_dev ) hw_dev = getenv("CIN_HW_DEV");
        if( !hw_dev ) hw_dev = ffmpeg->ff_hw_dev();
-       if( hw_dev && *hw_dev && strcmp(_("none"), hw_dev) ) {
+       if( hw_dev && *hw_dev &&
+           strcmp("none", hw_dev) && strcmp(_("none"), hw_dev) ) {
                type = av_hwdevice_find_type_by_name(hw_dev);
                if( type == AV_HWDEVICE_TYPE_NONE ) {
                        fprintf(stderr, "Device type %s is not supported.\n", hw_dev);
@@ -2371,7 +2372,7 @@ int FFMPEG::open_decoder()
        }
        if( bad_time && !(fflags & FF_BAD_TIMES) ) {
                fflags |= FF_BAD_TIMES;
-               printf("FFMPEG::open_decoder: some stream have bad times: %s\n",
+               printf(_("FFMPEG::open_decoder: some stream have bad times: %s\n"),
                        fmt_ctx->url);
        }
        ff_unlock();