summaryrefslogtreecommitdiff
path: root/libavcodec/brenderpix.c
Commit message (Collapse)AuthorAge
* Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5'Michael Niedermayer2014-08-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5': avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8 Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/raw.c libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h libswscale/swscale_internal.h libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8Vittorio Giovara2014-08-04
| | | | | | | | | | | | | | The rationale is that you have a packed format in form <greyscale sample> <alpha sample> <greyscale sample> <alpha sample> and shortening greyscale to 'G' might make one thing about Greenscale instead. An alias pixel format and color space name are provided for compatibility.
* | avcodec/brenderpix: propagate error codesMichael Niedermayer2014-03-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/brenderpix: remove unused variableMichael Niedermayer2014-03-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f'Michael Niedermayer2014-03-27
|/ | | | | | | | | | | | | * commit 'ae17878fb2ab100264226c84c58f5b95a703312f': BRender PIX image decoder Conflicts: doc/general.texi libavcodec/Makefile libavcodec/version.h See: 492a5f835c59ab7c2e347d3579d8bf6148ae0a0, and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
* BRender PIX image decoderAleksi Nurmi2014-03-27
Further enhancements by Vittorio Giovara and Paul B Mahol. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>