[FFmpeg-cvslog] lavf/movenc: improve psp check

[Matthieu Bouron]

ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron at gmail.com> | Sun Jul 28 16:46:05 2013 +0200| [8a09195545029672470e44a0f5c6bc6c86fb2ed5] | committer: Michael Niedermayer

lavf/movenc: improve psp check

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

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

 libavformat/movenc.c |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index e8e1a98..42ec3f2 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -3557,7 +3557,18 @@ static int mov_write_header(AVFormatContext *s)
 
     mov_write_ftyp_tag(pb,s);
     if (mov->mode == MODE_PSP) {
-        if (s->nb_streams != 2) {
+        int video_streams_nb = 0, audio_streams_nb = 0, other_streams_nb = 0;
+        for (i = 0; i < s->nb_streams; i++) {
+            AVStream *st = s->streams[i];
+            if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+                video_streams_nb++;
+            else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+                audio_streams_nb++;
+            else
+                other_streams_nb++;
+            }
+
+        if (video_streams_nb != 1 || audio_streams_nb != 1 || other_streams_nb) {
             av_log(s, AV_LOG_ERROR, "PSP mode need one video and one audio stream\n");
             return -1;
         }