diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 17:41:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 17:47:36 +0100 |
| commit | a201639a01284003a055f195f4e850a0cf3fc2d5 (patch) | |
| tree | 959d66dc788f6d76941e646bbb49dea93209b231 /libavcodec/dnxhdenc.h | |
| parent | 788afee86e283535f37fdcb649b2f180ad305f75 (diff) | |
| parent | 7658295ba353b8bedb3af904f46cfb1ba0cea86a (diff) | |
| download | ffmpeg-a201639a01284003a055f195f4e850a0cf3fc2d5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pixfmt: support more yuva formats
swscale: support gray to 9bit and 10bit formats
configure: rewrite print_config() function using awk
FATE: fix (AD)PCM test dependencies broken in e519990
Use ptrdiff_t instead of int for intra pred "stride" function parameter.
x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes.
Conflicts:
libavcodec/h264pred.c
libavcodec/h264pred_template.c
libavutil/pixfmt.h
libswscale/swscale_unscaled.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dnxhdenc.h')
0 files changed, 0 insertions, 0 deletions