From 75fdbfd024ded0df53b5b150276fada661d02491 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 5 Dec 2011 06:12:15 -0300 Subject: [PATCH] --- yaml --- r: 276870 b: refs/heads/master c: a626f3945208af1d60d3dccf064cac3b15bc54ca h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0eec85b646f3..ce22b96df893 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1ee8878a142f81ea1b40d602c6360b752829437 +refs/heads/master: a626f3945208af1d60d3dccf064cac3b15bc54ca diff --git a/trunk/drivers/media/video/s5p-mfc/s5p_mfc_enc.c b/trunk/drivers/media/video/s5p-mfc/s5p_mfc_enc.c index 1e8cdb77d4b8..dff9dc798795 100644 --- a/trunk/drivers/media/video/s5p-mfc/s5p_mfc_enc.c +++ b/trunk/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,