1. 10 Mar, 2013 5 commits
    • Nicolas George's avatar
      9cc02101
    • Nicolas George's avatar
      rawdec: work with refcounted frames. · 6184fa20
      Nicolas George authored
      Adapted from commit 759001c5
      by Anton Khirnov.
      
      Also, fix the use of || instead of | in a flags check.
      6184fa20
    • Michael Niedermayer's avatar
      Merge commit '7e350379' · a05a44e2
      Michael Niedermayer authored
      * commit '7e350379':
        lavfi: switch to AVFrame.
      
      Conflicts:
      	doc/filters.texi
      	libavfilter/af_ashowinfo.c
      	libavfilter/audio.c
      	libavfilter/avfilter.c
      	libavfilter/avfilter.h
      	libavfilter/buffersink.c
      	libavfilter/buffersrc.c
      	libavfilter/buffersrc.h
      	libavfilter/f_select.c
      	libavfilter/f_setpts.c
      	libavfilter/fifo.c
      	libavfilter/split.c
      	libavfilter/src_movie.c
      	libavfilter/version.h
      	libavfilter/vf_aspect.c
      	libavfilter/vf_bbox.c
      	libavfilter/vf_blackframe.c
      	libavfilter/vf_delogo.c
      	libavfilter/vf_drawbox.c
      	libavfilter/vf_drawtext.c
      	libavfilter/vf_fade.c
      	libavfilter/vf_fieldorder.c
      	libavfilter/vf_fps.c
      	libavfilter/vf_frei0r.c
      	libavfilter/vf_gradfun.c
      	libavfilter/vf_hqdn3d.c
      	libavfilter/vf_lut.c
      	libavfilter/vf_overlay.c
      	libavfilter/vf_pad.c
      	libavfilter/vf_scale.c
      	libavfilter/vf_showinfo.c
      	libavfilter/vf_transpose.c
      	libavfilter/vf_vflip.c
      	libavfilter/vf_yadif.c
      	libavfilter/video.c
      	libavfilter/vsrc_testsrc.c
      	libavfilter/yadif.h
      
      Following are notes about the merge authorship and various technical details.
      
      Michael Niedermayer:
        * Main merge operation, notably avfilter.c and video.c
        * Switch to AVFrame:
          - afade
          - anullsrc
          - apad
          - aresample
          - blackframe
          - deshake
          - idet
          - il
          - mandelbrot
          - mptestsrc
          - noise
          - setfield
          - smartblur
          - tinterlace
        * various merge changes and fixes in:
          - ashowinfo
          - blackdetect
          - field
          - fps
          - select
          - testsrc
          - yadif
      
      Nicolas George:
        * Switch to AVFrame:
          - make rawdec work with refcounted frames. Adapted from commit
            759001c5 by Anton Khirnov.
            Also, fix the use of || instead of | in a flags check.
          - make buffer sink and src, audio and video work all together
      
      Clément Bœsch:
        * Switch to AVFrame:
          - aevalsrc
          - alphaextract
          - blend
          - cellauto
          - colormatrix
          - concat
          - earwax
          - ebur128
          - edgedetect
          - geq
          - histeq
          - histogram
          - hue
          - kerndeint
          - life
          - movie
          - mp (with the help of Michael)
          - overlay
          - pad
          - pan
          - pp
          - pp
          - removelogo
          - sendcmd
          - showspectrum
          - showwaves
          - silencedetect
          - stereo3d
          - subtitles
          - super2xsai
          - swapuv
          - thumbnail
          - tile
      
      Hendrik Leppkes:
        * Switch to AVFrame:
          - aconvert
          - amerge
          - asetnsamples
          - atempo
          - biquads
      
      Matthieu Bouron:
        * Switch to AVFrame
          - alphamerge
          - decimate
          - volumedetect
      
      Stefano Sabatini:
        * Switch to AVFrame:
          - astreamsync
          - flite
          - framestep
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      Signed-off-by: 's avatarNicolas George <nicolas.george@normalesup.org>
      Signed-off-by: 's avatarClément Bœsch <ubitux@gmail.com>
      Signed-off-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
      Signed-off-by: 's avatarMatthieu Bouron <matthieu.bouron@gmail.com>
      Signed-off-by: 's avatarStefano Sabatini <stefasab@gmail.com>
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      a05a44e2
    • Clément Bœsch's avatar
    • Nicolas George's avatar
      lavu/frame: copy the channels field. · d1b456b0
      Nicolas George authored
      d1b456b0
  2. 09 Mar, 2013 8 commits
  3. 08 Mar, 2013 27 commits