mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
7d8f115843
* 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> |
||
|---|---|---|
| .. | ||
| bfin | ||
| mlib | ||
| ppc | ||
| sparc | ||
| x86 | ||
| colorspace-test.c | ||
| libswscale.v | ||
| Makefile | ||
| options.c | ||
| rgb2rgb_template.c | ||
| rgb2rgb.c | ||
| rgb2rgb.h | ||
| swscale_internal.h | ||
| swscale_unscaled.c | ||
| swscale-test.c | ||
| swscale.c | ||
| swscale.h | ||
| utils.c | ||
| yuv2rgb.c | ||