• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 042f9d62
    Michael Niedermayer authored
    * qatar/master:
      configure: Automatically add more flags required on symbian
      mem.h: switch doxygen parameter order to match function prototype
      doxygen: replace @sa tag by the more readable but equivalent @see
      doxygen: use Doxygen markup for authors and web links where appropriate
      doxygen: do not include license boilerplate in Doxygen documentation
      ac3enc: Mark AVClasses const
      ffserver: Replace two loops with one loop.
      ffmpeg: Fix the check for experimental codecs
      swscale: extend mmx padding.
      swscale: clip unscaled colorspace conversion path.
      doxygen: misc consistency cosmetics
      doc: remove file name from @file directive in Doxygen usage example
      doxygen: consistently place brief description
      doxygen: place empty line between brief description and detailed description
      avformat_open_input(): Add braces to shut up gcc warning.
    
    Conflicts:
    	libavcodec/8svx.c
    	libavcodec/tiff.c
    	libavcodec/tiff.h
    	libavcodec/vaapi_h264.c
    	libavcodec/vorbis.c
    	libavcodec/vorbisdec.c
    	libavcodec/vp6.c
    	libswscale/swscale_unscaled.c
    	libswscale/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    042f9d62
eatqi.c 5.31 KB