diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-06 20:19:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-06 20:23:17 +0200 |
| commit | ac6659aff77b08a894967a2880eef13218baacb9 (patch) | |
| tree | 0ec5b859d165dc69c1097f61169a4a402b8804c8 | |
| parent | 51211d351cd25ab631d6d045932a7b0d2880a115 (diff) | |
| download | ffmpeg-ac6659aff77b08a894967a2880eef13218baacb9.tar.gz | |
movenc: fix regression with yuyv caused by c5f23d
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/movenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index d456c4fc1d..8ab1db8c5b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -907,10 +907,11 @@ 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->codec_tag == mov_pix_fmt_tags[i].tag && track->enc->pix_fmt == mov_pix_fmt_tags[i].pix_fmt) { + if (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; + if (track->enc->codec_tag == mov_pix_fmt_tags[i].tag) + break; } } |