[FFmpeg-cvslog] movenc: fix regression with yuyv caused by c5f23d

[Michael Niedermayer]

ffmpeg | branch: release/1.0 | Michael Niedermayer <michaelni at gmx.at> | Sat Oct  6 20:19:05 2012 +0200| [8c103410a6d5c58636b9e7c3ad4246290109891b] | committer: Michael Niedermayer

movenc: fix regression with yuyv caused by c5f23d

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit ac6659aff77b08a894967a2880eef13218baacb9)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8c103410a6d5c58636b9e7c3ad4246290109891b
---

 libavformat/movenc.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 4b0a547..7819f6e 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;
         }
     }