diff options
author | wm4 <wm4@nowhere> | 2013-07-08 00:35:04 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-07-08 00:35:04 +0200 |
commit | c4f33d784a058325b26ba82f34c43dab0cb19dc8 (patch) | |
tree | f2440ba82efc84193ba7f4599416bea3989c17a1 /demux/demux.c | |
parent | aac5d758c5a60f13162bc2b500618389bfd92602 (diff) | |
download | mpv-c4f33d784a058325b26ba82f34c43dab0cb19dc8.tar.bz2 mpv-c4f33d784a058325b26ba82f34c43dab0cb19dc8.tar.xz |
demux: remove some old stream header functions
Diffstat (limited to 'demux/demux.c')
-rw-r--r-- | demux/demux.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/demux/demux.c b/demux/demux.c index 9d02abc8f1..6506677275 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -343,24 +343,6 @@ static void free_sh_sub(sh_sub_t *sh) free_sh_stream(sh->gsh); } -sh_audio_t *new_sh_audio_aid(demuxer_t *demuxer, int id, int aid) -{ - if (id > MAX_A_STREAMS - 1 || id < 0) { - mp_msg(MSGT_DEMUXER, MSGL_WARN, - "Requested audio stream id overflow (%d > %d)\n", id, - MAX_A_STREAMS); - return NULL; - } - if (demuxer->a_streams[id]) { - mp_tmsg(MSGT_DEMUXER, MSGL_WARN, "WARNING: Audio stream header %d redefined.\n", id); - } else { - mp_tmsg(MSGT_DEMUXER, MSGL_V, "==> Found audio stream: %d\n", id); - new_sh_stream_id(demuxer, STREAM_AUDIO, id, aid); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", aid); - } - return demuxer->a_streams[id]; -} - static void free_sh_audio(demuxer_t *demuxer, int id) { sh_audio_t *sh = demuxer->a_streams[id]; @@ -371,24 +353,6 @@ static void free_sh_audio(demuxer_t *demuxer, int id) free_sh_stream(sh->gsh); } -sh_video_t *new_sh_video_vid(demuxer_t *demuxer, int id, int vid) -{ - if (id > MAX_V_STREAMS - 1 || id < 0) { - mp_msg(MSGT_DEMUXER, MSGL_WARN, - "Requested video stream id overflow (%d > %d)\n", id, - MAX_V_STREAMS); - return NULL; - } - if (demuxer->v_streams[id]) - mp_tmsg(MSGT_DEMUXER, MSGL_WARN, "WARNING: Video stream header %d redefined.\n", id); - else { - mp_tmsg(MSGT_DEMUXER, MSGL_V, "==> Found video stream: %d\n", id); - new_sh_stream_id(demuxer, STREAM_VIDEO, id, vid); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", vid); - } - return demuxer->v_streams[id]; -} - static void free_sh_video(sh_video_t *sh) { mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_video at %p\n", sh); |