summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-14 17:59:26 +0200
committerwm4 <wm4@nowhere>2013-07-14 17:59:26 +0200
commite18ffd6b998858ca0797cb0ce4aabd4a509655dd (patch)
tree199bddd30923db1175a1331191eb86ba684e9e41 /video
parent3e7d483ac89289f613138002be2043ec5f479bb0 (diff)
parent5ead20bdb3328d199dad693039d18e7a05eb2465 (diff)
downloadmpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.bz2
mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.xz
Merge branch 'remove_old_demuxers'
The merged branch doesn't actually just remove old demuxers, but also includes a branch of cleanups and some refactoring. Conflicts: stream/stream.c
Diffstat (limited to 'video')
-rw-r--r--video/decode/dec_video.c4
-rw-r--r--video/decode/vd.c1
-rw-r--r--video/decode/vd_lavc.c5
-rw-r--r--video/out/gl_lcms.c2
4 files changed, 3 insertions, 9 deletions
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 <stdbool.h>
#include <assert.h>
-#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"
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);
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);