1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00

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 <michaelni@gmx.at>
This commit is contained in:
Piotr Bandurski
2012-07-25 11:59:05 +02:00
committed by Michael Niedermayer
parent 9054f6b66b
commit c5f23df2dd

View File

@@ -859,6 +859,7 @@ static const struct {
uint32_t tag; uint32_t tag;
unsigned bps; unsigned bps;
} mov_pix_fmt_tags[] = { } mov_pix_fmt_tags[] = {
{ PIX_FMT_YUYV422, MKTAG('y','u','v','2'), 0 },
{ PIX_FMT_YUYV422, MKTAG('y','u','v','s'), 0 }, { PIX_FMT_YUYV422, MKTAG('y','u','v','s'), 0 },
{ PIX_FMT_UYVY422, MKTAG('2','v','u','y'), 0 }, { PIX_FMT_UYVY422, MKTAG('2','v','u','y'), 0 },
{ PIX_FMT_RGB555BE,MKTAG('r','a','w',' '), 16 }, { 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; int i;
for (i = 0; i < FF_ARRAY_ELEMS(mov_pix_fmt_tags); 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; tag = mov_pix_fmt_tags[i].tag;
track->enc->bits_per_coded_sample = mov_pix_fmt_tags[i].bps; track->enc->bits_per_coded_sample = mov_pix_fmt_tags[i].bps;
break; break;