diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 14:28:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 14:28:58 +0100 |
| commit | af804dbe9ed0e6a1b2d5e9eca1a7155c2fe91e3e (patch) | |
| tree | f093e566a4985317a2dc7d9f3f5df38599142720 /libavformat/nsvdec.c | |
| parent | 80a9297b711b7acb152ebbf84b28772945f920ea (diff) | |
| parent | 523c7bd23c781aa0f3a85044896f5e18e8b52534 (diff) | |
| download | ffmpeg-af804dbe9ed0e6a1b2d5e9eca1a7155c2fe91e3e.tar.gz | |
Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'
* commit '523c7bd23c781aa0f3a85044896f5e18e8b52534':
misc typo, style and wording fixes
Conflicts:
libavcodec/options_table.h
libavutil/pixfmt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nsvdec.c')
| -rw-r--r-- | libavformat/nsvdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index b6984a68a2..bcc2180019 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -251,7 +251,7 @@ static int nsv_resync(AVFormatContext *s) nsv->state = NSV_FOUND_BEEF; return 0; } - /* we read as big endian, thus the MK*BE* */ + /* we read as big-endian, thus the MK*BE* */ if (v == TB_NSVF) { /* NSVf */ av_dlog(s, "NSV resynced on NSVf after %d bytes\n", i+1); nsv->state = NSV_FOUND_NSVF; |