From af0c41e162725b0edcd6c3d066a2dbef05a3b896 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 7 Jul 2013 23:54:11 +0200 Subject: Remove old demuxers Delete demux_avi, demux_asf, demux_mpg, demux_ts. libavformat does better than them (except in rare corner cases), and the demuxers have a bad influence on the rest of the code. Often they don't output proper packets, and require additional audio and video parsing. Most work only in --no-correct-pts mode. Remove them to facilitate further cleanups. --- video/decode/vd_lavc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'video') diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index ff1565f38f..3b266aeb94 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -345,10 +345,7 @@ static void init_avctx(sh_video_t *sh, const char *decoder, struct hwdec *hwdec) avctx->coded_width = sh->disp_w; avctx->coded_height = sh->disp_h; - // demux_avi only - avctx->stream_codec_tag = sh->video.fccHandler; - - // demux_mkv, demux_avi, demux_asf + // demux_mkv if (sh->bih) set_from_bih(avctx, sh->format, sh->bih); -- cgit v1.2.3 From 52c3eb69765a0d1070bf240353095c8ff546765b Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 11 Jul 2013 21:10:42 +0200 Subject: core: change open_stream and demux_open signature This removes the dependency on DEMUXER_TYPE_* and the file_format parameter from the stream open functions. Remove some of the playlist handling code. It looks like this was needed only for loading linked mov files with demux_mov (which was removed long ago). Delete a minor bit of dead network-related code from stream.c as well. --- video/out/gl_lcms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'video') diff --git a/video/out/gl_lcms.c b/video/out/gl_lcms.c index 69f7c7fa12..f7e418f1d1 100644 --- a/video/out/gl_lcms.c +++ b/video/out/gl_lcms.c @@ -85,7 +85,7 @@ static void lcms2_error_handler(cmsContext ctx, cmsUInt32Number code, static struct bstr load_file(void *talloc_ctx, const char *filename) { struct bstr res = {0}; - stream_t *s = open_stream(filename, NULL, NULL); + stream_t *s = stream_open(filename, NULL); if (s) { res = stream_read_complete(s, talloc_ctx, 1000000000); free_stream(s); -- cgit v1.2.3 From cb45b1c65b2fe4644342db202e5f7b9fb64f2488 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 12 Jul 2013 22:04:44 +0200 Subject: Cleanup some include statements --- video/decode/dec_video.c | 4 +--- video/decode/vd.c | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'video') diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c index ed856e046c..d101237699 100644 --- a/video/decode/dec_video.c +++ b/video/decode/dec_video.c @@ -24,14 +24,12 @@ #include #include -#include "demux/codec_tags.h" - #include "core/mp_msg.h" #include "osdep/timer.h" #include "stream/stream.h" -#include "demux/demux.h" +#include "demux/demux_packet.h" #include "core/codecs.h" diff --git a/video/decode/vd.c b/video/decode/vd.c index 6f05ab334c..9df1d39146 100644 --- a/video/decode/vd.c +++ b/video/decode/vd.c @@ -28,7 +28,6 @@ #include "video/img_format.h" #include "stream/stream.h" -#include "demux/demux.h" #include "demux/stheader.h" #include "dec_video.h" -- cgit v1.2.3