Mercurial > mplayer.hg

comparison libmpdemux/demux_avi.c @ 21406:3acff79cdd9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
100l confused FFMIN/FFMAX
author reimar
date Fri, 01 Dec 2006 19:43:36 +0000
parents a120cda87e3e
children 19bfd17ba231
comparison
equal deleted inserted replaced
21405:a120cda87e3e 21406:3acff79cdd9f
765 case DEMUXER_CTRL_SWITCH_AUDIO: 765 case DEMUXER_CTRL_SWITCH_AUDIO:
766 case DEMUXER_CTRL_SWITCH_VIDEO: { 766 case DEMUXER_CTRL_SWITCH_VIDEO: {
767 int audio = (cmd == DEMUXER_CTRL_SWITCH_AUDIO); 767 int audio = (cmd == DEMUXER_CTRL_SWITCH_AUDIO);
768 demux_stream_t *ds = audio ? demuxer->audio : demuxer->video; 768 demux_stream_t *ds = audio ? demuxer->audio : demuxer->video;
769 void **streams = audio ? demuxer->a_streams : demuxer->v_streams; 769 void **streams = audio ? demuxer->a_streams : demuxer->v_streams;
770 int maxid = FFMAX(99, audio ? MAX_A_STREAMS : MAX_V_STREAMS); 770 int maxid = FFMIN(100, audio ? MAX_A_STREAMS : MAX_V_STREAMS);
771 int chunkid; 771 int chunkid;
772 if (ds->id < -1) 772 if (ds->id < -1)
773 return DEMUXER_CTRL_NOTIMPL; 773 return DEMUXER_CTRL_NOTIMPL;
774 774
775 if (*(int *)arg >= 0) 775 if (*(int *)arg >= 0)