RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2013-01-08 12:34:14 +01:00
parent 1a088f61e1 9a00374cb4
commit 3bca69c2a8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/developer.texi
View File

@ -190,7 +190,7 @@ set shiftwidth=4
set softtabstop=4 set softtabstop=4
set cindent set cindent
set cinoptions=(0 set cinoptions=(0
" allow tabs in Makefiles " Allow tabs in Makefiles.
autocmd FileType make set noexpandtab shiftwidth=8 softtabstop=8 autocmd FileType make set noexpandtab shiftwidth=8 softtabstop=8
" Trailing whitespace and tabs are forbidden, so highlight them. " Trailing whitespace and tabs are forbidden, so highlight them.
highlight ForbiddenWhitespace ctermbg=red guibg=red 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 When adding new codec IDs, also add an entry to the codec descriptor
list in @file{libavcodec/codec_desc.c}. list in @file{libavcodec/codec_desc.c}.
@item @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? even if it is only a decoder?
@item @item
Did you add a rule to compile the appropriate files in the Makefile? Did you add a rule to compile the appropriate files in the Makefile?

2
libavformat/asfdec.c
View File

@ -765,7 +765,7 @@ static int asf_read_header(AVFormatContext *s)
} }
} }
if(avio_tell(pb) != gpos + gsize) 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); avio_seek(pb, gpos + gsize, SEEK_SET);
} }
ff_get_guid(pb, &g); ff_get_guid(pb, &g);