mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
4e04e1b81e
* qatar/master: swscale: convert yuv2yuvX() to using named arguments. swscale: rename "dstw" to "w" to prevent name collisions. swscale: use named registers in yuv2yuv1_plane() place. lavf: fix aspect ratio mismatch message. avconv: set AVFormatContext.duration from '-t' cljr: implement encode2. cljr: set the properties of the coded_frame, not input frame. dnxhdenc: switch to encode2. bmpenc: switch to encode2(). Conflicts: libavcodec/bmpenc.c libavcodec/cljr.c libavformat/utils.c tests/ref/vsynth1/cljr tests/ref/vsynth2/cljr Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| bfin | ||
| ppc | ||
| sparc | ||
| x86 | ||
| colorspace-test.c | ||
| input.c | ||
| libswscale.v | ||
| Makefile | ||
| options.c | ||
| output.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 | ||