diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-04 10:17:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-04 10:17:52 +0200 |
| commit | 0104570fb65bef9986a630e0188b3756295693a9 (patch) | |
| tree | d0612ebe9b9cdf7fcf7da0c6ced55c0609887e05 /libavformat/idcin.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 'libavformat/idcin.c')
| -rw-r--r-- | libavformat/idcin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/idcin.c b/libavformat/idcin.c index 2a8af40676..1dcc574630 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -136,7 +136,7 @@ static int idcin_probe(AVProbeData *p) if (number > 2) return 0; - /* return half certainly since this check is a bit sketchy */ + /* return half certainty since this check is a bit sketchy */ return AVPROBE_SCORE_MAX / 2; } |