1. 04 Apr, 2012 21 commits
  2. 03 Apr, 2012 10 commits
  3. 02 Apr, 2012 8 commits
  4. 01 Apr, 2012 1 commit
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 49891784
      Michael Niedermayer authored
      * qatar/master:
        vsrc_buffer: allow buffering arbitrary number of frames.
        vf_scale: avoid a pointless memcpy in no-op conversion.
        avfiltergraph: try to reduce format conversions in filters.
        avfiltergraph: add an AVClass to AVFilterGraph on next major bump.
        id3v2: fix skipping extended header in id3v2.4
      
      Conflicts:
      	libavfilter/vf_scale.c
      	libavfilter/vsrc_buffer.c
      	libavformat/id3v2.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      49891784