diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-04 12:17:52 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-04 12:17:52 +0400 |
| commit | 0104570fb65bef9986a630e0188b3756295693a9 (patch) | |
| tree | d0612ebe9b9cdf7fcf7da0c6ced55c0609887e05 /libavcodec/flac_parser.c | |
| parent | 711c8ee71d719d6d89a523618f078bb17dbe1abf (diff) | |
| parent | a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7 (diff) | |
Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'
* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7':
silly typo fixes
Conflicts:
doc/protocols.texi
libavcodec/aacpsy.c
libavformat/utils.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flac_parser.c')
| -rw-r--r-- | libavcodec/flac_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c index e2c6744d78..f4184a1878 100644 --- a/libavcodec/flac_parser.c +++ b/libavcodec/flac_parser.c @@ -27,7 +27,7 @@ * Each time it finds and verifies a CRC-8 header it sees which of the * FLAC_MAX_SEQUENTIAL_HEADERS that came before it have a valid CRC-16 footer * that ends at the newly found header. - * Headers are scored by FLAC_HEADER_BASE_SCORE plus the max of it's crc-verified + * Headers are scored by FLAC_HEADER_BASE_SCORE plus the max of its crc-verified * children, penalized by changes in sample rate, frame number, etc. * The parser returns the frame with the highest score. **/ |