diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-28 14:06:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-28 14:11:31 +0100 |
| commit | bb2f4ae434223e99f131100f4bc71762b79eb6c5 (patch) | |
| tree | c852670be02a3ec5972b389a238eabcf59f04095 /libavcodec/flacdec.c | |
| parent | 51e9d2dbc8f8e7aed216222a496cc7e588afa217 (diff) | |
| parent | 05b0998f511ffa699407465d48c7d5805f746ad2 (diff) | |
| download | ffmpeg-bb2f4ae434223e99f131100f4bc71762b79eb6c5.tar.gz | |
Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2'
* commit '05b0998f511ffa699407465d48c7d5805f746ad2':
dsputil: Fix error by not using redzone and register name
swscale: GBRP output support
Conflicts:
libswscale/output.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/utils.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/flacdec.c')
0 files changed, 0 insertions, 0 deletions