[vlc-commits] AVformat: do not use static attachment pictures as stream

[Jean-Baptiste Kempf]

vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Nov 16 17:13:02 2012 +0100| [7d3eba0d4f7e2ff6072d320da02008c1317a5767] | committer: Jean-Baptiste Kempf

AVformat: do not use static attachment pictures as stream
(cherry picked from commit 89a3302c734f2195b620e1bca12670834abd18c9)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=7d3eba0d4f7e2ff6072d320da02008c1317a5767
---

 modules/demux/avformat/demux.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 867a924..10956d22 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -278,6 +278,12 @@ int OpenDemux( vlc_object_t *p_this )
         if( !GetVlcFourcc( cc->codec_id, NULL, &fcc, NULL ) )
             fcc = VLC_FOURCC( 'u', 'n', 'd', 'f' );
 
+#if LIBAVFORMAT_VERSION_INT >= ((54<<16)+(2<<8)+0)
+        /* Do not use the cover art as a stream */
+        if( s->disposition == AV_DISPOSITION_ATTACHED_PIC )
+            continue;
+#endif
+
         switch( cc->codec_type )
         {
         case AVMEDIA_TYPE_AUDIO: