diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:55:03 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:55:03 +0000 |
| commit | 4c5f830c4c9d4f19c1eef356c0cd322b46d695c9 (patch) | |
| tree | a14ad6c652736bb28859a7aec392a01b236ae58d /drivers/media/video/s5p-mfc/s5p_mfc_enc.c | |
| parent | cc511b8d84d88ab788cddbfe8d21485b1c387493 (diff) | |
| parent | 2e3d256de9d3db5a7ca19b61305627a516b54b45 (diff) | |
| download | blackbird-op-linux-4c5f830c4c9d4f19c1eef356c0cd322b46d695c9.tar.gz blackbird-op-linux-4c5f830c4c9d4f19c1eef356c0cd322b46d695c9.zip | |
Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD
Conflicts:
arch/arm/plat-omap/include/plat/common.h
Diffstat (limited to 'drivers/media/video/s5p-mfc/s5p_mfc_enc.c')
| -rw-r--r-- | drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c index ecef127dbc66..dff9dc798795 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c +++ b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c @@ -61,7 +61,7 @@ static struct s5p_mfc_fmt formats[] = { .num_planes = 1, }, { - .name = "H264 Encoded Stream", + .name = "H263 Encoded Stream", .fourcc = V4L2_PIX_FMT_H263, .codec_mode = S5P_FIMV_CODEC_H263_ENC, .type = MFC_FMT_ENC, @@ -785,8 +785,8 @@ static int vidioc_querycap(struct file *file, void *priv, strncpy(cap->card, dev->plat_dev->name, sizeof(cap->card) - 1); cap->bus_info[0] = 0; cap->version = KERNEL_VERSION(1, 0, 0); - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE - | V4L2_CAP_VIDEO_OUTPUT + cap->capabilities = V4L2_CAP_VIDEO_CAPTURE_MPLANE + | V4L2_CAP_VIDEO_OUTPUT_MPLANE | V4L2_CAP_STREAMING; return 0; } |
