ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert bogus code in Image(AvFrame)

This commit is contained in:
Isaac Connor 2020-02-24 14:10:54 -05:00
parent a29030c5f8
commit c1dfb8571a
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/zm_image.cpp
View File

@ -168,18 +168,8 @@ Image::Image( const AVFrame *frame ) {
height = frame->height;
pixels = width*height;
if ( frame->format == AV_PIX_FMT_RGBA ) {
colours = ZM_COLOUR_RGB32;
subpixelorder = ZM_SUBPIX_ORDER_RGBA;
} else if ( frame->format == AV_PIX_FMT_RGB24 ) {
colours = ZM_COLOUR_RGB24;
subpixelorder = ZM_SUBPIX_ORDER_RGB;
} else if ( frame->format == AV_PIX_FMT_GRAY8 ) {
colours = ZM_COLOUR_GRAY8;
subpixelorder = ZM_SUBPIX_ORDER_NONE;
} else {
Error("Unhandled frame format: %d", frame->format);
}
colours = ZM_COLOUR_RGB32;
subpixelorder = ZM_SUBPIX_ORDER_RGBA;
size = pixels*colours;
buffer = 0;