diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-06 20:19:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 19:36:15 +0100 |
| commit | 8c103410a6d5c58636b9e7c3ad4246290109891b (patch) | |
| tree | 0d3127759f0d768ec8d57233e94b9de2a1aa4511 | |
| parent | 5bd5bb9e56c9f15a16ed3b026b87723f81d018f4 (diff) | |
| download | ffmpeg-8c103410a6d5c58636b9e7c3ad4246290109891b.tar.gz | |
movenc: fix regression with yuyv caused by c5f23d
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ac6659aff77b08a894967a2880eef13218baacb9)
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 4b0a547e70..7819f6ec35 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -887,10 +887,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; } } |