Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: patched-ffmpeg-mt/libavfilter/vf_crop.c

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: patched-ffmpeg-mt/libavfilter/vf_crop.c
===================================================================
--- patched-ffmpeg-mt/libavfilter/vf_crop.c (revision 41250)
+++ patched-ffmpeg-mt/libavfilter/vf_crop.c (working copy)
@@ -24,6 +24,7 @@
*/
#include "avfilter.h"
+#include "libavutil/pixdesc.h"
typedef struct {
int x; ///< x offset of the non-cropped area with respect to the input area
@@ -173,11 +174,7 @@
ref2->data[0] += crop->y * ref2->linesize[0];
ref2->data[0] += (crop->x * crop->bpp) >> 3;
- if (link->format != PIX_FMT_PAL8 &&
- link->format != PIX_FMT_BGR4_BYTE &&
- link->format != PIX_FMT_RGB4_BYTE &&
- link->format != PIX_FMT_BGR8 &&
- link->format != PIX_FMT_RGB8) {
+ if (!(av_pix_fmt_descriptors[link->format].flags & PIX_FMT_PAL)) {
for (i = 1; i < 3; i ++) {
if (ref2->data[i]) {
ref2->data[i] += (crop->y >> crop->vsub) * ref2->linesize[i];

Powered by Google App Engine
This is Rietveld 408576698