[vlc-commits] demux: mp4: bind jpeg to mjpeg (fix #14846)

Francois Cartegnie git at videolan.org
Thu Jun 18 11:30:40 CEST 2015


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jun 18 11:29:18 2015 +0200| [5e9dd354530de14a47fcefb09b8e21d3b39052f4] | committer: Francois Cartegnie

demux: mp4: bind jpeg to mjpeg (fix #14846)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5e9dd354530de14a47fcefb09b8e21d3b39052f4
---

 modules/demux/mp4/essetup.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/demux/mp4/essetup.c b/modules/demux/mp4/essetup.c
index bdceefd..75120c7 100644
--- a/modules/demux/mp4/essetup.c
+++ b/modules/demux/mp4/essetup.c
@@ -273,6 +273,10 @@ int SetupVideoES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )
             break;
         }
 
+        case VLC_FOURCC('j', 'p', 'e', 'g'):
+            p_track->fmt.i_codec = VLC_CODEC_MJPG;
+           break;
+
         case VLC_CODEC_FFV1:
         {
             MP4_Box_t *p_binary = MP4_BoxGet( p_sample, "glbl" );



More information about the vlc-commits mailing list