generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'

Browse Source 
* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7':
  silly typo fixes

Conflicts:
	doc/protocols.texi
	libavcodec/aacpsy.c
	libavformat/utils.c
	tools/patcheck

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-04 10:17:52 +02:00
parent 711c8ee71d a5f8873620
commit 0104570fb6
13 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/wavdec.c
View File

@@ -85,9 +85,9 @@ static int wav_probe(AVProbeData *p)
return 0;
if (!memcmp(p->buf + 8, "WAVE", 4)) {
if (!memcmp(p->buf, "RIFF", 4))
/* Since ACT demuxer has standard WAV header at top of it's
* own, returning score is decreased to avoid probe conflict
* between ACT and WAV. */
/* Since the ACT demuxer has a standard WAV header at the top of
* its own, the returned score is decreased to avoid a probe
* conflict between ACT and WAV. */
return AVPROBE_SCORE_MAX - 1;
else if (!memcmp(p->buf, "RF64", 4) &&
!memcmp(p->buf + 12, "ds64", 4))