summaryrefslogtreecommitdiff
path: root/libavcodec/imgconvert.c
diff options
context:
space:
mode:
authorBenjamin Larsson <banan@ludd.ltu.se>2010-09-20 11:34:27 +0000
committerBenjamin Larsson <banan@ludd.ltu.se>2010-09-20 11:34:27 +0000
commit4792d1e792788ea3bab2e9aed9d345fe9c9c7ba2 (patch)
tree009e19f2c3532fe4a8e434d4aef28bbdb016506e /libavcodec/imgconvert.c
parent63206a8ffb131e03c04173c1426090532d276ee9 (diff)
Support deinterlacing of YUVJ420P.
Originally committed as revision 25148 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/imgconvert.c')
-rw-r--r--libavcodec/imgconvert.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 525ae1b61f..5e7f1fd570 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -1175,6 +1175,7 @@ int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
int i;
if (pix_fmt != PIX_FMT_YUV420P &&
+ pix_fmt != PIX_FMT_YUVJ420P &&
pix_fmt != PIX_FMT_YUV422P &&
pix_fmt != PIX_FMT_YUV444P &&
pix_fmt != PIX_FMT_YUV411P &&
@@ -1186,6 +1187,7 @@ int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
for(i=0;i<3;i++) {
if (i == 1) {
switch(pix_fmt) {
+ case PIX_FMT_YUVJ420P:
case PIX_FMT_YUV420P:
width >>= 1;
height >>= 1;