diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-06-17 02:13:00 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-06-17 02:13:00 +0400 |
| commit | 8062ee962652db6c9d2a6a314893632ae3b2bae9 (patch) | |
| tree | 9c3f06e7d5e7042c881d04abcd62ba6720221b73 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/imgconvert.c | |
| parent | c5ec9f4e4c88fcef7874556888e4bd413f864723 (diff) | |
updated ffmpeg
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2053 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/imgconvert.c')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/imgconvert.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/imgconvert.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/imgconvert.c index 77bc77a5c..3db5fb47d 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/imgconvert.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/imgconvert.c @@ -936,7 +936,8 @@ int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane) return (width * bits + 7) >> 3;
break;
case FF_PIXEL_PLANAR:
- if (plane == 1 || plane == 2)
+ if ((pix_fmt != PIX_FMT_NV12 && pix_fmt != PIX_FMT_NV21) &&
+ (plane == 1 || plane == 2))
width= -((-width)>>desc->log2_chroma_w);
return (width * pf->depth + 7) >> 3;
|