1. 13 May, 2011 6 commits
    • Stefano Sabatini's avatar
      tiffenc: factorize code for monow/monob case in encode_frame() switch · ac8d6f12
      Stefano Sabatini authored
      Reduce code duplication, increase robustness.
      ac8d6f12
    • Stefano Sabatini's avatar
      995013eb
    • Stefano Sabatini's avatar
      tiff: fix linesize for mono-white/black formats · d8297ca4
      Stefano Sabatini authored
      Fix decoding of file Test_1bpp.tif, fix trac issue #171.
      d8297ca4
    • Stefano Sabatini's avatar
      tiff: print log in case of unknown / unsupported tag · 762b4662
      Stefano Sabatini authored
      Helps debugging.
      762b4662
    • Michael Niedermayer's avatar
    • Michael Niedermayer's avatar
      Merge remote branch 'qatar/master' · 72153419
      Michael Niedermayer authored
      * qatar/master: (33 commits)
        rtpdec_qdm2: Don't try to parse data packet if no configuration is received
        ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand.
        ac3enc: clean up count_frame_bits() and count_frame_bits_fixed()
        mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame.
        srtdec: make sure we don't write past the end of buffer
        wmaenc: improve channel count and bitrate error handling in encode_init()
        matroskaenc: make sure we don't produce invalid file with no codec ID
        matroskadec: check that pointers were initialized before accessing them
        lavf: fix function name in compute_pkt_fields2 av_dlog message
        lavf: fix av_find_best_stream when providing a wanted stream.
        lavf: fix av_find_best_stream when decoder_ret is given and using a related stream.
        ffmpeg: factorize quality calculation
        tiff: add support for SamplesPerPixel tag in tiff_decode_tag()
        tiff: Prefer enum TiffCompr over int for TiffContext.compr.
        mov: Support edit list atom version 1.
        configure: Enable libpostproc automatically if GPL code is enabled.
        Cosmetics: fix prototypes in oggdec
        oggdec: fix memleak with continuous streams.
        matroskaenc: add missing new line in av_log() call
        dnxhdenc: add AVClass in private context.
        ...
      
      swscale changes largely rewritten by me or replaced by baptsites due to lots of bugs in ronalds code.
      Above code is also just in case its not obvios to a large extended duplicates that where cherry picked
      from ffmpeg.
      
      Conflicts:
      	configure
      	ffmpeg.c
      	libavformat/matroskaenc.c
      	libavutil/pixfmt.h
      	libswscale/ppc/swscale_template.c
      	libswscale/swscale.c
      	libswscale/swscale_template.c
      	libswscale/utils.c
      	libswscale/x86/swscale_template.c
      	tests/fate/h264.mak
      	tests/ref/lavfi/pixdesc_le
      	tests/ref/lavfi/pixfmts_copy_le
      	tests/ref/lavfi/pixfmts_null_le
      	tests/ref/lavfi/pixfmts_scale_le
      	tests/ref/lavfi/pixfmts_vflip_le
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      72153419
  2. 12 May, 2011 34 commits