Permalink
Commits on Jul 20, 2011
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    * qatar/master:
      Remove h264_lowres_idct_put/add functions
      Remove snow/dwt test program
      h264: remove some disabled code
      Fix incorrect max_lowres values
      matroskadec: fix integer underflow if header length < probe length.
      cosmetics: indentation
      eac3enc: use frame exponent strategy when applicable.
      cosmetics: rename eac3dec_data.c/h to eac3_data.c/h since the tables will also be used in the E-AC-3 encoder.
      dsputil: fix ff_check_alignment()
    
    Conflicts:
    	libavcodec/Makefile
    	libavcodec/h264idct_template.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Jul 20, 2011
  2. @mansr

    Remove h264_lowres_idct_put/add functions

    Use of these has been broken ever since the h264 idct was changed
    to always use transposed inputs.  Furthermore, they were only
    ever used if some *other* non-default idct was requested.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
    mansr committed Jul 20, 2011
  3. @mansr

    Remove snow/dwt test program

    This test program so full of programming errors it is impossible
    to make sense of it.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
    mansr committed Jul 17, 2011
  4. @DonDiego

    h264: remove some disabled code

    DonDiego committed Jul 17, 2011
  5. @mansr

    Fix incorrect max_lowres values

    Signed-off-by: Mans Rullgard <mans@mansr.com>
    mansr committed Jul 20, 2011
  6. @rbultje

    matroskadec: fix integer underflow if header length < probe length.

    This fixes a crash with specifically crafted files.
    
    Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
    Chris Evans committed with rbultje Jul 20, 2011
  7. @michaelni

    libx264.c: distinguish between x264 parameter errors.

    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    Erik Slagter committed with michaelni Jul 18, 2011
Commits on Jul 19, 2011
  1. @justinruggles

    cosmetics: indentation

    justinruggles committed Jul 13, 2011
  2. @justinruggles

    eac3enc: use frame exponent strategy when applicable.

    This checks if the set of selected exponent strategies for all blocks in a
    channel are in the frame exponent strategy table, and if so, writes the
    table index instead of each strategy. This saves up to 7 bits per channel per
    frame, so the overall effect on quality is small.
    justinruggles committed Jul 13, 2011
  3. @justinruggles

    cosmetics: rename eac3dec_data.c/h to eac3_data.c/h since the tables …

    …will also
    
    be used in the E-AC-3 encoder.
    justinruggles committed Jul 12, 2011
  4. @michaelni

    Merge remote-tracking branch 'qatar/master'

    * qatar/master:
      simple_idct: simplify some ifdeffery
      simple_idct: remove code for DCTELEM != int16
      Remove VLAs in ff_amrwb_lsp2lpc()
      fate: make vsynth tests depend on only the relevant vref
      rtsp: remove disabled code
      dsputil: restore mistakenly removed hunk of disabled code
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Jul 19, 2011
  5. @mansr

    dsputil: fix ff_check_alignment()

    The change to LOCAL_ALIGNED means the declared object must be an
    array and the subsequent test should not use the & operator.
    
    Noticed by Uoti Urpala.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
    mansr committed Jul 19, 2011
  6. Do not use AVFMT_FLAG_NONBLOCK for the output file.

    Restore the commit 0de8ebf by Carl Eugen Hoyos that was lost during the
    merge 58257ea.
    Nicolas George committed Jul 16, 2011
Commits on Jul 18, 2011
  1. @mansr

    simple_idct: simplify some ifdeffery

    Signed-off-by: Mans Rullgard <mans@mansr.com>
    mansr committed Jul 18, 2011
  2. @mansr

    simple_idct: remove code for DCTELEM != int16

    DCTELEM can never be changed to anything else, too much code
    depends on it.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
    mansr committed Jul 18, 2011
  3. @rdoeffinger

    Bink: clip AC coefficients during dequantization.

    Fixes artefacts with Neverwinter Nights WOTCLogo.bik
    (http://drmccoy.de/zeugs/WOTCLogo.bik).
    Fixes trac ticket #352.
    
    Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
    rdoeffinger committed Jul 17, 2011
  4. @rdoeffinger

    Remove a pointless/bad "static".

    It has no advantage and seems to cause compile issues with
    some combinations of compiler/compiler flags/PIC.
    
    Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
    rdoeffinger committed Jul 18, 2011
  5. @mansr

    Remove VLAs in ff_amrwb_lsp2lpc()

    Signed-off-by: Mans Rullgard <mans@mansr.com>
    mansr committed Jul 17, 2011
  6. @mansr

    fate: make vsynth tests depend on only the relevant vref

    Signed-off-by: Mans Rullgard <mans@mansr.com>
    mansr committed Jul 17, 2011
  7. @DonDiego

    rtsp: remove disabled code

    DonDiego committed Jul 17, 2011
  8. @DonDiego

    dsputil: restore mistakenly removed hunk of disabled code

    This particular part serves to document the optimized code variant.
    DonDiego committed Jul 18, 2011
  9. @michaelni

    Merge remote-tracking branch 'qatar/master'

    * qatar/master:
      vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
      dsputil: remove disabled code
      tta: remove disabled code
      gxfenc: place variable declarations before statements
      x86: Use LOCAL_ALIGNED in mpegvideo_mmx_template
      random_seed: use proper #includes
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Jul 18, 2011
  10. au: add computation for duration

    Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
    ami_stuff committed with Stefano Sabatini Jul 18, 2011
  11. @DonDiego

    vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h

    cxtypes.h works with version 2.1 and older, cxcore.h works with 2.2 and older.
    
    Signed-off-by: Diego Biurrun <diego@biurrun.de>
    Stefano Sabatini committed with DonDiego Jul 15, 2011
  12. @DonDiego

    dsputil: remove disabled code

    DonDiego committed Jul 17, 2011
Commits on Jul 17, 2011
  1. @DonDiego

    tta: remove disabled code

    DonDiego committed Jul 17, 2011
  2. @DonDiego

    gxfenc: place variable declarations before statements

    libavformat/gxfenc.c:409: warning: ISO C90 forbids mixed declarations and code
    DonDiego committed Jul 17, 2011
  3. @mstorsjo

    x86: Use LOCAL_ALIGNED in mpegvideo_mmx_template

    Signed-off-by: Martin Storsjö <martin@martin.st>
    mstorsjo committed Jul 17, 2011
  4. @mansr

    random_seed: use proper #includes

    Use <> for system headers, add needed math.h, drop unnecessary avutil.h.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
    mansr committed Jul 17, 2011
  5. @michaelni

    Merge remote-tracking branch 'qatar/master'

    * qatar/master:
      ffmpeg: fix some indentation
      ffmpeg: fix operation with --disable-avfilter
      simple_idct: remove disabled code
      motion_est: remove disabled code
      vc1: remove disabled code
      fate: separate lavf-mxf_d10 test from lavf-mxf
      cabac: Move code only used in the cabac test program to cabac.c.
      ffplay: warn that -pix_fmt is no longer working, suggest alternative
      ffplay: warn that -s is no longer working, suggest alternative
      lavf: rename enc variable in utils.c:has_codec_parameters()
      lavf: use designated initialisers for all (de)muxers.
      wav: remove a use of deprecated AV_METADATA_ macro
      rmdec: remove useless ap parameter from rm_read_header_old()
      dct-test: remove write-only variable
      des: fix #if conditional around P_shuffle
      Use LOCAL_ALIGNED in ff_check_alignment()
    
    Conflicts:
    	ffmpeg.c
    	libavformat/avidec.c
    	libavformat/matroskaenc.c
    	libavformat/mp3enc.c
    	libavformat/oggenc.c
    	libavformat/utils.c
    	tests/ref/lavf/mxf
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Jul 17, 2011
  6. @mansr

    ffmpeg: fix some indentation

    Signed-off-by: Mans Rullgard <mans@mansr.com>
    mansr committed Jul 17, 2011
  7. @mansr

    ffmpeg: fix operation with --disable-avfilter

    The width and height must be copied from the input before
    being used.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
    mansr committed Jul 17, 2011
  8. @DonDiego
  9. @DonDiego
  10. @DonDiego

    vc1: remove disabled code

    DonDiego committed Jul 17, 2011