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 /libavformat/pmpdec.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/pmpdec.c')
-rw-r--r-- | libavformat/pmpdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/pmpdec.c b/libavformat/pmpdec.c index 2fe6c46e13..71f450e9d3 100644 --- a/libavformat/pmpdec.c +++ b/libavformat/pmpdec.c @@ -174,7 +174,7 @@ static int pmp_seek(AVFormatContext *s, int stream_index, int64_t ts, int flags) { PMPContext *pmp = s->priv_data; pmp->cur_stream = 0; - // fallback to default seek now + // fall back on default seek now return -1; } |