diff options
| author | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
| commit | e18ffd6b998858ca0797cb0ce4aabd4a509655dd (patch) | |
| tree | 199bddd30923db1175a1331191eb86ba684e9e41 /video/decode/dec_video.c | |
| parent | 3e7d483ac89289f613138002be2043ec5f479bb0 (diff) | |
| parent | 5ead20bdb3328d199dad693039d18e7a05eb2465 (diff) | |
| download | mpv-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/decode/dec_video.c')
| -rw-r--r-- | video/decode/dec_video.c | 4 |
1 files changed, 1 insertions, 3 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" |