diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-08 12:34:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-08 12:34:14 +0100 |
| commit | 3bca69c2a8e70a199d806767624672c4858d091f (patch) | |
| tree | 360c73ec4151a02bc88489cc0988ebaf54996e67 | |
| parent | 1a088f61e1b8d620c313c47d861a1a4b29fd7156 (diff) | |
| parent | 9a00374cb4512a58a1fee366b850dfa87c76e1f3 (diff) | |
| download | ffmpeg-3bca69c2a8e70a199d806767624672c4858d091f.tar.gz | |
Merge commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3'
* commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3':
doc: Fix a few typos in the developer documentation
xwma: Remove unused variable
asfdec: Fix printf format string length modifier
Conflicts:
doc/developer.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/developer.texi | 4 | ||||
| -rw-r--r-- | libavformat/asfdec.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/developer.texi b/doc/developer.texi index e75f3b9403..7210207f82 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -190,7 +190,7 @@ set shiftwidth=4 set softtabstop=4 set cindent set cinoptions=(0 -" allow tabs in Makefiles +" Allow tabs in Makefiles. autocmd FileType make set noexpandtab shiftwidth=8 softtabstop=8 " Trailing whitespace and tabs are forbidden, so highlight them. highlight ForbiddenWhitespace ctermbg=red guibg=red @@ -398,7 +398,7 @@ send a reminder by email. Your patch should eventually be dealt with. When adding new codec IDs, also add an entry to the codec descriptor list in @file{libavcodec/codec_desc.c}. @item - If it has a fourCC, did you add it to @file{libavformat/riff.c}, + If it has a FourCC, did you add it to @file{libavformat/riff.c}, even if it is only a decoder? @item Did you add a rule to compile the appropriate files in the Makefile? diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 2dcdf56adb..5c2cf8b9b0 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -765,7 +765,7 @@ static int asf_read_header(AVFormatContext *s) } } if(avio_tell(pb) != gpos + gsize) - av_log(s, AV_LOG_DEBUG, "gpos mismatch our pos=%"PRIu64", end=%"PRIu64"\n", avio_tell(pb)-gpos, gsize); + av_log(s, AV_LOG_DEBUG, "gpos mismatch our pos=%"PRIu64", end=%"PRId64"\n", avio_tell(pb)-gpos, gsize); avio_seek(pb, gpos + gsize, SEEK_SET); } ff_get_guid(pb, &g); |