aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mjpega_dump_header_bsf.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-25 01:38:21 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-25 04:34:44 +0100
commit92afb431621c79155fcb7171d26f137eb1bee028 (patch)
tree2beb660ea9fafc1d2d304c0f7df610ebf54117e0 /libavcodec/mjpega_dump_header_bsf.c
parent3880b4541ace2697f380ae1f43cb2299efeb2cc7 (diff)
parent7f1b427018ecff59e0e14031eecc79aac0d91ec8 (diff)
downloadffmpeg-92afb431621c79155fcb7171d26f137eb1bee028.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: snow: split snow in snowdec and snowenc tiffenc: deprecate using compression_level swscale: fix failing fate tests. swscale: add support for planar RGB input. h264: add support for decoding planar RGB images. Clean up swscale pixfmt macros using av_pix_fmt_descriptors[]. pixfmt: add planar RGB formats. Conflicts: libavcodec/h264.c libavcodec/snow.c libavcodec/utils.c libavutil/avutil.h libavutil/pixdesc.c libavutil/pixfmt.h libswscale/swscale.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpega_dump_header_bsf.c')
0 files changed, 0 insertions, 0 deletions