diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-03 02:25:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-03 03:06:45 +0100 |
| commit | 7d8f1158436c261d2d1657c33e731f9bec650c51 (patch) | |
| tree | cf3c0261ba5202ad949af637a026b11dc4631a00 /libpostproc | |
| parent | 45552371e3434fb7aa4d0bc566fd4ef954f9af14 (diff) | |
| parent | 881a5e047dc78ec9ab771817497dffec503d77ee (diff) | |
| download | ffmpeg-7d8f1158436c261d2d1657c33e731f9bec650c51.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegenc: use avctx->slices as number of slices
v410enc: fix undefined signed left shift caused by integer promotion
Release notes: mention cleaned up header includes
fix Changelog file
Fix a bunch of typos.
Drop some pointless void* return value casts from av_malloc() invocations.
wavpack: fix typos in previous cosmetic clean-up commit
wavpack: cosmetics: K&R pretty-printing
avconv: remove the 'codec framerate is different from stream' warning
wavpack: determine sample_fmt before requesting a buffer
bmv audio: implement new audio decoding API
mpegaudiodec: skip all channels when skipping granules
mpegenc: simplify muxrate calculation
Conflicts:
Changelog
avconv.c
doc/RELEASE_NOTES
libavcodec/h264.c
libavcodec/mpeg12.c
libavcodec/mpegaudiodec.c
libavcodec/mpegvideo.c
libavformat/mpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc')
| -rw-r--r-- | libpostproc/postprocess_template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c index 04dd36c314..924a39b9f1 100644 --- a/libpostproc/postprocess_template.c +++ b/libpostproc/postprocess_template.c @@ -3369,14 +3369,14 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ linecpy(tempSrc + srcStride*copyAhead, srcBlock + srcStride*copyAhead, FFMAX(height-y-copyAhead, 0), srcStride); - /* duplicate last line of src to fill the void upto line (copyAhead+7) */ + /* duplicate last line of src to fill the void up to line (copyAhead+7) */ for(i=FFMAX(height-y, 8); i<copyAhead+8; i++) memcpy(tempSrc + srcStride*i, src + srcStride*(height-1), FFABS(srcStride)); /* copy up to (copyAhead+1) lines of dst (line -1 to (copyAhead-1))*/ linecpy(tempDst, dstBlock - dstStride, FFMIN(height-y+1, copyAhead+1), dstStride); - /* duplicate last line of dst to fill the void upto line (copyAhead) */ + /* duplicate last line of dst to fill the void up to line (copyAhead) */ for(i=height-y+1; i<=copyAhead; i++) memcpy(tempDst + dstStride*i, dst + dstStride*(height-1), FFABS(dstStride)); |