diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-23 16:46:16 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-23 16:46:16 +0000 |
| commit | 0aa92466a1e02407f19070dbea14326fb3b69a15 (patch) | |
| tree | 0b5ea663e43b77b0f337edd7dfa26aa3e472925c /libmpdemux/demux_avi.c | |
| parent | 5d884056a19772f7129a6f6727426ae485046047 (diff) | |
| download | mpv-0aa92466a1e02407f19070dbea14326fb3b69a15.tar.bz2 mpv-0aa92466a1e02407f19070dbea14326fb3b69a15.tar.xz | |
Allow lowercase letters in AVI stream id, fixes bug #277
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20416 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_avi.c')
| -rw-r--r-- | libmpdemux/demux_avi.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 797d545fca..bea92d2ae9 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -80,14 +80,11 @@ demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id){ } static int valid_fourcc(unsigned int id){ + static const char valid[] = "0123456789abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ_"; unsigned char* fcc=(unsigned char*)(&id); -#define FCC_CHR_CHECK(x) (x<48 || x>=96) - if(FCC_CHR_CHECK(fcc[0])) return 0; - if(FCC_CHR_CHECK(fcc[1])) return 0; - if(FCC_CHR_CHECK(fcc[2])) return 0; - if(FCC_CHR_CHECK(fcc[3])) return 0; - return 1; -#undef FCC_CHR_CHECK + return strchr(valid, fcc[0]) && strchr(valid, fcc[1]) && + strchr(valid, fcc[2]) && strchr(valid, fcc[3]); } static int choose_chunk_len(unsigned int len1,unsigned int len2){ |