[FFmpeg-cvslog] ffmpeg: make stream default if its the only of its kind and no source can be unambigously assigned to it

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 25 02:08:35 2013 +0200| [a443b9732f75dbf9018214c5706e01534bb37f28] | committer: Michael Niedermayer

ffmpeg: make stream default if its the only of its kind and no source can be unambigously assigned to it

Fixes Ticket2969

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

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

 ffmpeg.c |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ffmpeg.c b/ffmpeg.c
index 3148267..001e5c1 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2160,6 +2160,15 @@ static int transcode_init(void)
             ost->st->disposition          = ist->st->disposition;
             codec->bits_per_raw_sample    = icodec->bits_per_raw_sample;
             codec->chroma_sample_location = icodec->chroma_sample_location;
+        } else {
+            for (j=0; j<oc->nb_streams; j++) {
+                AVStream *st = oc->streams[j];
+                if (st != ost->st && st->codec->codec_type == codec->codec_type)
+                    break;
+            }
+            if (j == oc->nb_streams)
+                if (codec->codec_type == AVMEDIA_TYPE_AUDIO || codec->codec_type == AVMEDIA_TYPE_VIDEO)
+                    ost->st->disposition = AV_DISPOSITION_DEFAULT;
         }
 
         if (ost->stream_copy) {