• Michael Niedermayer's avatar
    Merge commit '581281e2' · 61ced71d
    Michael Niedermayer authored
    * commit '581281e2':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    61ced71d
tiffenc.c 17.6 KB