From c5f23df2ddbf5239155ef6de127585788b2497ea Mon Sep 17 00:00:00 2001 From: Piotr Bandurski Date: Wed, 25 Jul 2012 11:59:05 +0200 Subject: [PATCH] movenc: fix remuxing of yuv2 Attached patch fixes remuxing of yuv2 in mov (and does not break remuxing of yuvs) Signed-off-by: Michael Niedermayer --- libavformat/movenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index d2347e7fb3..b50218cd99 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -859,6 +859,7 @@ static const struct { uint32_t tag; unsigned bps; } mov_pix_fmt_tags[] = { + { PIX_FMT_YUYV422, MKTAG('y','u','v','2'), 0 }, { PIX_FMT_YUYV422, MKTAG('y','u','v','s'), 0 }, { PIX_FMT_UYVY422, MKTAG('2','v','u','y'), 0 }, { PIX_FMT_RGB555BE,MKTAG('r','a','w',' '), 16 }, @@ -881,7 +882,7 @@ static int mov_get_rawvideo_codec_tag(AVFormatContext *s, MOVTrack *track) int i; for (i = 0; i < FF_ARRAY_ELEMS(mov_pix_fmt_tags); i++) { - if (track->enc->pix_fmt == mov_pix_fmt_tags[i].pix_fmt) { + if (track->enc->codec_tag == mov_pix_fmt_tags[i].tag && track->enc->pix_fmt == mov_pix_fmt_tags[i].pix_fmt) { tag = mov_pix_fmt_tags[i].tag; track->enc->bits_per_coded_sample = mov_pix_fmt_tags[i].bps; break;