Skip to content
Commits on Mar 17, 2013
  1. @michaelni

    Merge remote-tracking branch 'cus/stable'

    michaelni committed
    * cus/stable:
      ffplay: add -af option
      ffplay: use refcounted frames for audio
      ffplay: use frame->pts if available for setting the audio clock
      ffplay: restructure audio stream opening code
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  2. @michaelni

    h264_qpel: fix another forgotten int stride

    michaelni committed
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  3. @ubitux
  4. @cus

    ffplay: add -af option

    cus committed
    Based on a patch by Stefano Sabatini <stefasab@gmail.com>:
    http://ffmpeg.org/pipermail/ffmpeg-devel/2013-February/138452.html
    
    Signed-off-by: Marton Balint <cus@passwd.hu>
  5. @cus

    ffplay: use refcounted frames for audio

    cus committed
    Signed-off-by: Marton Balint <cus@passwd.hu>
  6. @cus

    ffplay: use frame->pts if available for setting the audio clock

    cus committed
    Signed-off-by: Marton Balint <cus@passwd.hu>
  7. @cus

    ffplay: restructure audio stream opening code

    cus committed
    Preparation for -af support.
    
    Signed-off-by: Marton Balint <cus@passwd.hu>
  8. @ubitux
  9. @michaelni

    avutil/frame: fix video buffer allocation

    michaelni committed
    The padding was lost during porting from avcodec
    Should fix out of array accesses
    
    Found-by: ubitux
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  10. @saste

    tests/filter-metadata-scenedetect: update reference

    saste committed
    Fix reference after f7ab23b.
    +10l to me, this time aliens are not involved.
  11. @saste

    tests/eval: fix reference after b2098d2

    saste committed
    +10l to me, I blame the aliens.
  12. @ubitux

    lavfi/thumbnail: replace frame unref with free.

    ubitux committed
    Fixes memleak spotted by FATE.
Commits on Mar 16, 2013
  1. @saste
  2. @saste
  3. @saste
  4. @saste
  5. @saste

    lavu/eval: add bitor and bitand functions

    saste committed
    Warning note suggested by Reimar.
  6. @Nevcairiel @michaelni

    lavfi: let gcc realign the stack on public graph driving functions

    Nevcairiel committed with michaelni
    The functions which actually drive the filter graph by pushing
    frames through it need to ensure an aligned stack for SIMD functions.
    
    This fixes a crash in YADIF filter when using a mingw build in a MSVC application.
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  7. @ubitux
  8. @michaelni

    yadif: remove an 'm' from the LOAD macro definition

    James Darnley committed with michaelni
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  9. @michaelni

    yadif: remove repeated check on width

    James Darnley committed with michaelni
    The filter already checks that width (and height) are greater than 3.
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  10. @michaelni

    yadif: cosmetic indentation from previous commits

    James Darnley committed with michaelni
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  11. @michaelni

    yadif: x86 assembly for 9 to 14-bit samples

    James Darnley committed with michaelni
    These smaller samples do not need to be unpacked to double words
    allowing the code to process more pixels every iteration (still 2 in MMX
    but 6 in SSE2).  It also avoids emulating the missing double word
    instructions on older instruction sets.
    
    Like with the previous code for 16-bit samples this has been tested on
    an Athlon64 and a Core2Quad.
    
    Athlon64:
    1809275 decicycles in C,    32718 runs, 50 skips
     911675 decicycles in mmx,  32727 runs, 41 skips, 2.0x faster
     495284 decicycles in sse2, 32747 runs, 21 skips, 3.7x faster
    
    Core2Quad:
     921363 decicycles in C,     32756 runs, 12 skips
     486537 decicycles in mmx,   32764 runs,  4 skips, 1.9x faster
     293296 decicycles in sse2,  32759 runs,  9 skips, 3.1x faster
     284910 decicycles in ssse3, 32759 runs,  9 skips, 3.2x faster
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  12. @michaelni

    yadif: x86 assembly for 16-bit samples

    James Darnley committed with michaelni
    This is a fairly dumb copy of the assembly for 8-bit samples but it
    works and produces identical output to the C version.  The options have
    been tested on an Athlon64 and a Core2Quad.
    
    Athlon64:
    1810385 decicycles in C,    32726 runs, 42 skips
    1080744 decicycles in mmx,  32744 runs, 24 skips, 1.7x faster
     818315 decicycles in sse2, 32735 runs, 33 skips, 2.2x faster
    
    Core2Quad:
     924025 decicycles in C,     32750 runs, 18 skips
     623995 decicycles in mmx,   32767 runs,  1 skips, 1.5x faster
     406223 decicycles in sse2,  32764 runs,  4 skips, 2.3x faster
     387842 decicycles in ssse3, 32767 runs,  1 skips, 2.4x faster
     307726 decicycles in sse4,  32763 runs,  5 skips, 3.0x faster
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  13. @cehoyos @beastd

    Do not (re-)set libx264 parameter b_tff if interlaced encoding was no…

    cehoyos committed with beastd
    …t requested.
    
    Reconfiguring can break x264 lossless encoding.
    
    Fixes ticket #2165.
  14. @Nevcairiel @michaelni

    lavfi/avcodec: deprecate remainders of the avcodec glue code

    Nevcairiel committed with michaelni
    Since lavfi works natively with AVFrame now, these functions are no longer
    necessary and can be removed in a future bump.
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  15. @michaelni

    append_packet_chunked: Remove unused initialization.

    michaelni committed
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  16. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni committed
    * qatar/master:
      af_join: do not leak input frames.
      asrc_anullsrc: return EOF, not -1
    
    Conflicts:
    	libavfilter/asrc_anullsrc.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  17. @michaelni

    Merge commit 'f4281f457194a6a4489fbd7423e2ab2e13c6d4d9'

    michaelni committed
    * commit 'f4281f457194a6a4489fbd7423e2ab2e13c6d4d9':
      asrc_anullsrc: do not set samplerate and channel layout explicitly
    
    Conflicts:
    	libavfilter/asrc_anullsrc.c
    
    No change to FFmpeg due to semantic difference between the filter sources
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  18. @michaelni

    Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b'

    michaelni committed
    * commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b':
      vf_showinfo: remove its useless init function
      AVOptions: fix using named constants with child contexts.
    
    Conflicts:
    	libavutil/opt.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  19. @michaelni

    Merge commit '9676b9a2cdc4a90611188fc48d8d388e427997c5'

    michaelni committed
    * commit '9676b9a2cdc4a90611188fc48d8d388e427997c5':
      AVOption: remove an unused function parameter.
      filters.texi: restore mistakenly removed section name for noformat
      avfiltergraph: use sizeof(var) instead of sizeof(type)
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  20. @ubitux
  21. @ubitux
  22. @michaelni

    Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'

    michaelni committed
    * commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf':
      avfiltergraph: replace AVFilterGraph.filter_count with nb_filters
    
    Conflicts:
    	doc/APIchanges
    	libavfilter/avfiltergraph.c
    	libavfilter/avfiltergraph.h
    	libavfilter/graphparser.c
    	libavfilter/version.h
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Something went wrong with that request. Please try again.