Skip to content

O
opencv
Commit e00f1e39 authored by Alexander Reshetnikov's avatar Alexander Reshetnikov
Browse files
Options

Fixed a problem with CODEC_ID_RAWVIDEO in FFMPEG (ticket #1400)

parent aea24ffc
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
modules/highgui/src/cap_ffmpeg_impl.hpp
View file @ e00f1e39
...@@ -1262,8 +1262,10 @@ bool CvVideoWriter_FFMPEG::open( const char * filename, int fourcc, ...@@ -1262,8 +1262,10 @@ bool CvVideoWriter_FFMPEG::open( const char * filename, int fourcc,
bitrate_scale = 128; bitrate_scale = 128;
break; break;
case CODEC_ID_RAWVIDEO: case CODEC_ID_RAWVIDEO:
codec_pix_fmt = input_pix_fmt; codec_pix_fmt = input_pix_fmt == PIX_FMT_GRAY8 ||
break; input_pix_fmt == PIX_FMT_GRAY16LE ||
input_pix_fmt == PIX_FMT_GRAY16BE ? input_pix_fmt : PIX_FMT_YUV420P;
break;
default: default:
// good for lossy formats, MPEG, etc. // good for lossy formats, MPEG, etc.
codec_pix_fmt = PIX_FMT_YUV420P; codec_pix_fmt = PIX_FMT_YUV420P;
......
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
View file @ e00f1e39
...@@ -1372,8 +1372,10 @@ bool CvVideoWriter_FFMPEG::open( const char * filename, int fourcc, ...@@ -1372,8 +1372,10 @@ bool CvVideoWriter_FFMPEG::open( const char * filename, int fourcc,
bitrate_scale = 128; bitrate_scale = 128;
break; break;
case CODEC_ID_RAWVIDEO: case CODEC_ID_RAWVIDEO:
codec_pix_fmt = input_pix_fmt; codec_pix_fmt = input_pix_fmt == PIX_FMT_GRAY8 ||
break; input_pix_fmt == PIX_FMT_GRAY16LE ||
input_pix_fmt == PIX_FMT_GRAY16BE ? input_pix_fmt : PIX_FMT_YUV420P;
break;
default: default:
// good for lossy formats, MPEG, etc. // good for lossy formats, MPEG, etc.
codec_pix_fmt = PIX_FMT_YUV420P; codec_pix_fmt = PIX_FMT_YUV420P;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment