diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-03 05:25:56 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-03 06:06:45 +0400 |
| commit | 7d8f1158436c261d2d1657c33e731f9bec650c51 (patch) | |
| tree | cf3c0261ba5202ad949af637a026b11dc4631a00 /libavcodec/v410enc.c | |
| parent | 45552371e3434fb7aa4d0bc566fd4ef954f9af14 (diff) | |
| parent | 881a5e047dc78ec9ab771817497dffec503d77ee (diff) | |
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 'libavcodec/v410enc.c')
| -rw-r--r-- | libavcodec/v410enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/v410enc.c b/libavcodec/v410enc.c index e6c837eef6..e7d9c4e384 100644 --- a/libavcodec/v410enc.c +++ b/libavcodec/v410enc.c @@ -67,7 +67,7 @@ static int v410_encode_frame(AVCodecContext *avctx, uint8_t *buf, for (j = 0; j < avctx->width; j++) { val = u[j] << 2; val |= y[j] << 12; - val |= v[j] << 22; + val |= (uint32_t) v[j] << 22; AV_WL32(dst, val); dst += 4; output_size += 4; |