Merge VLC_OBJECT_PACKETIZER with VLC_OBJECT_DECODER

[vlc] / src / input / demux.c

diff --git a/src/input/demux.c b/src/input/demux.c
index 16440c4642706d8754d074c4e398787b4f4db062..3a69970fd741756d2f434cf062a9f202f2567e47 100644 (file)
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -98,6 +98,7 @@ demux_t *__demux_New( vlc_object_t *p_obj,
             { "au",   "au" },
             { "flac", "flac" },
             { "dv",   "dv" },
+            { "drc",  "dirac" },
             { "m3u",  "playlist" },
             { "mkv",  "mkv" }, { "mka",  "mkv" }, { "mks",  "mkv" },
             { "mp4",  "mp4" }, { "m4a",  "mp4" }, { "mov",  "mp4" }, { "moov", "mp4" },
@@ -112,26 +113,6 @@ demux_t *__demux_New( vlc_object_t *p_obj,
             { "h264", "h264" },
             { "voc",  "voc" },
             { "mid",  "smf" }, { "rmi",  "smf" },
-
-            { "jpeg", "image" },
-            { "jpg",  "image" },
-            { "ljpg", "image" },
-            { "png",  "image" },
-            { "pgm",  "image" },
-            { "pgmyuv", "image" },
-            { "pbm",  "image" },
-            { "pam",  "image" },
-            { "tga",  "image" },
-            { "bmp",  "image" },
-            { "pnm",  "image" },
-            { "xpm",  "image" },
-            { "xcf",  "image" },
-            { "pcx",  "image" },
-            { "gif",  "image" },
-            { "tif",  "image" },
-            { "tiff", "image" },
-            { "lbm",  "image" },
-
             { "",  "" },
         };
         /* Here, we don't mind if it does not work, it must be quick */
@@ -253,7 +234,7 @@ int demux_vaControlHelper( stream_t *s,
 
         case DEMUX_GET_TIME:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            if( i_bitrate > 0 && i_end > i_start )
+            if( i_bitrate > 0 && i_tell >= i_start )
             {
                 *pi64 = INT64_C(8000000) * (i_tell - i_start) / i_bitrate;
                 return VLC_SUCCESS;
@@ -320,13 +301,14 @@ int demux_vaControlHelper( stream_t *s,
  ****************************************************************************/
 decoder_t *demux_PacketizerNew( demux_t *p_demux, es_format_t *p_fmt, const char *psz_msg )
 {
-    decoder_t *p_packetizer = vlc_object_create( p_demux, VLC_OBJECT_PACKETIZER );
+    decoder_t *p_packetizer = vlc_object_create( p_demux, VLC_OBJECT_DECODER );
 
     if( !p_packetizer )
     {
         es_format_Clean( p_fmt );
         return NULL;
     }
+    p_fmt->b_packetized = false;
 
     p_packetizer->pf_decode_audio = NULL;
     p_packetizer->pf_decode_video = NULL;
@@ -347,6 +329,7 @@ decoder_t *demux_PacketizerNew( demux_t *p_demux, es_format_t *p_fmt, const char
 
     return p_packetizer;
 }
+
 void demux_PacketizerDestroy( decoder_t *p_packetizer )
 {
     if( p_packetizer->p_module )