1. 11 Apr, 2011 1 commit
    • Michael Niedermayer's avatar
      Merge remote branch 'qatar/master' · ab8cfd45
      Michael Niedermayer authored
      * qatar/master:
        avio: add more documentation for AVIOContext.
        Parse sprite data for WMVP and WVP2, and decode sprites for the latter
        Replace outdated info on the FAQ
        Redefine sameq
        pad: fix example explanation
        gradfun: add notice from the MPlayer manual
        eval: add support for trunc, ceil, and floor functions
        documentation: add setdar and setsar description to filters.texi
        avio: document some members of AVIOContext.
        avio: document avio_close().
        avio: cosmetics, vertically align comments.
        avio: cosmetics, group the reading functions.
        avio: cosmetics, merge all the FF_API_OLD_AVIO blocks.
        avio: cosmetics, move AVIOContext to start of the file.
        avio: update file header.
        os: fix OpenBSD/PowerPC compilation
        pixfmt: add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
        oggdec: fix demuxing chained audio streams
        fix typo
      
      Conflicts:
      	doc/filters.texi
      	libavformat/avio.h
      	libavutil/pixfmt.h
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      ab8cfd45
  2. 10 Apr, 2011 39 commits