diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 03:20:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 03:20:29 +0200 |
| commit | 61ced71d79ebef22f8ab6ee3511a7a989f6fd3ac (patch) | |
| tree | 6000ca917b87276d4e29b6ff5ca4fb7d0fee5b30 /libavcodec/tiffenc.c | |
| parent | d57ca5e5a8ba993630c87fbc87ed1f8267309278 (diff) | |
| parent | 581281e242609a222233a2e5538b89dfb88fb18e (diff) | |
| download | android_external_ffmpeg-61ced71d79ebef22f8ab6ee3511a7a989f6fd3ac.tar.gz android_external_ffmpeg-61ced71d79ebef22f8ab6ee3511a7a989f6fd3ac.tar.bz2 android_external_ffmpeg-61ced71d79ebef22f8ab6ee3511a7a989f6fd3ac.zip | |
Merge commit '581281e242609a222233a2e5538b89dfb88fb18e'
* commit '581281e242609a222233a2e5538b89dfb88fb18e':
matroskadec: check realloc in lzo encoding
matroska: honor error_recognition on unknown doctypes
tiffdec: Add support for GRAY16LE.
tiffenc: Add support for little endian RGB48 and GRAY16
mpeg4: support frame parameter changes with frame-mt
mpegvideo: check ff_find_unused_picture() return value for errors
mpegvideo: release frame buffers before freeing them
configure: msvc: default to 'lib' as 'ar' tool
build: support some non-standard ar variants
Conflicts:
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/tiff.c
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tiffenc.c')
| -rw-r--r-- | libavcodec/tiffenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index fe740168bc..7d9752367a 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -520,7 +520,8 @@ AVCodec ff_tiff_encoder = { .encode2 = encode_frame, .close = encode_close, .pix_fmts = (const enum PixelFormat[]) { - PIX_FMT_RGB24, PIX_FMT_PAL8, PIX_FMT_GRAY8, PIX_FMT_GRAY8A, PIX_FMT_GRAY16LE, + PIX_FMT_RGB24, PIX_FMT_PAL8, PIX_FMT_GRAY8, + PIX_FMT_GRAY8A, PIX_FMT_GRAY16LE, PIX_FMT_MONOBLACK, PIX_FMT_MONOWHITE, PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV440P, PIX_FMT_YUV444P, PIX_FMT_YUV410P, PIX_FMT_YUV411P, PIX_FMT_RGB48LE, |