* modules/demux/mp4/mp4.c: set fmt.video.i_bits_per_pixel (needed at least for QT...

* modules/codec/ffmpeg/ffmpeg.c: added QT RLE fourcc.
--This line, and
those below, will be ignored--

M    codec/ffmpeg/ffmpeg.c
M    demux/mp4/mp4.c

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 217d8a85c4125d97d97f440afdb07b95b1d27612..491b2e0d84c37364e3177b668a6a78f36236f591 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -831,6 +831,9 @@ static struct
 #endif
 
 #if LIBAVCODEC_BUILD >= 4752
+    { VLC_FOURCC('r','l','e',' '), CODEC_ID_QTRLE,
+      VIDEO_ES, "Apple QuickTime RLE Video" },
+
     { VLC_FOURCC('q','d','r','w'), CODEC_ID_QDRAW,
       VIDEO_ES, "Apple QuickDraw Video" },
 

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index cfa74ddc2f48df0869c31d9b84c339857558919a..7cc04d97936fce7ef5fad511fbc26003519e3efe 100644 (file)
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -1427,6 +1427,8 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
     case( VIDEO_ES ):
         p_track->fmt.video.i_width = p_sample->data.p_sample_vide->i_width;
         p_track->fmt.video.i_height = p_sample->data.p_sample_vide->i_height;
+        p_track->fmt.video.i_bits_per_pixel =
+            p_sample->data.p_sample_vide->i_depth;
 
         /* fall on display size */
         if( p_track->fmt.video.i_width <= 0 )