diff options
Diffstat (limited to 'video/decode')
-rw-r--r-- | video/decode/dec_video.c | 4 | ||||
-rw-r--r-- | video/decode/vd.c | 1 | ||||
-rw-r--r-- | video/decode/vd_lavc.c | 5 |
3 files changed, 2 insertions, 8 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); |