diff --git a/plugins/screenshots/action.php b/plugins/screenshots/action.php index 4dc2db3f7..a34e9ea40 100644 --- a/plugins/screenshots/action.php +++ b/plugins/screenshots/action.php @@ -38,10 +38,12 @@ $name = '"${dir}"/frame'.$i.($st->data['exformat'] ? '.png' : '.jpg'); $commands[] = Utility::getExternal("ffmpeg"). ' -ss '.$offs. - " -i ".escapeshellarg($filename). - ' -y -vframes 1 -an '. - ($useWidth ? '-vf "scale='.$st->data['exfrmwidth'].':-1"' : ''). - ' '. + ' -i '.escapeshellarg($filename). + ' -y'. + ' -vframes 1'. + ' -an'. + ' -sn'. + ' -vf "scale=\'max(sar,1)*iw\':\'max(1/sar,1)*ih\''.($useWidth ? ',scale='.$st->data['exfrmwidth'].':-1' : '').'" '. $name; $commands[] = '{'; $commands[] = '>'.$i; diff --git a/plugins/screenshots/conf.php b/plugins/screenshots/conf.php index d8fb56a32..239505bc0 100644 --- a/plugins/screenshots/conf.php +++ b/plugins/screenshots/conf.php @@ -7,12 +7,11 @@ $extensions = array ( - "3g2","3gp","4xm","iff","iss","mtv","roq","a64","ac3","anm","apc","asf","avi","avm2","avs","bethsoftvid", - "bink","c93","cavsvideo","cdg","dirac","dnxhd","dsicin","dts","dv","dv1394","dvd","ea","eac3","ffm","film_cpk", - "filmstrip","flic","flv","gxf","h261","h263","h264","idcin","image2","image2pipe", - "ingenient","ipmovie","ipod","iv8","ivf","m4v","matroska","mjpeg","mov","m4a","mj2", - "mp2","mp4","mpeg","mpeg1video","mpeg2video","mpegts","mpegtsraw","mpegvideo", - "msnwctcp","mvi","mxf","mxf_d10","nc","nsv","nuv","ogg","psp","psxstr","rawvideo","rm","rpl","rtsp", - "smk","svcd","swf","vcd","video4linux","video4linux2","vob","webm","wmv", - "mkv","ogm","mpg","mpv","m1v","m2v","mp2","qt","rmvb","dat","ts" + "3g2","3gp","4xm","a64","ac3","anm","apc","asf","avi","avm2","avs","bethsoftvid", + "bink","c93","cavsvideo","cdg","dat","dirac","dnxhd","dsicin","dts","dv","dv1394","dvd","ea","eac3","ffm","film_cpk", + "filmstrip","flic","flv","gxf","h261","h263","h264","idcin","iff","image2","image2pipe", + "ingenient","ipmovie","ipod","iss","iv8","ivf","m1v","m2ts","m2v","m4a","m4v","matroska","mj2","mjpeg","mkv","mov", + "mp2","mp2","mp4","mpeg","mpeg1video","mpeg2video","mpegts","mpegtsraw","mpegvideo","mpg","mpv", + "msnwctcp","mtv","mvi","mxf","mxf_d10","nc","nsv","nuv","ogg","ogm","psp","psxstr","qt","rawvideo","rm","rmvb","roq","rpl","rtsp", + "smk","svcd","swf","ts","vcd","video4linux","video4linux2","vob","webm","wmv", ); \ No newline at end of file