• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 2ec77aae
    Michael Niedermayer authored
    * qatar/master:
      lavf: make compute_pkt_fields2() return meaningful error values
      matroskadec: set timestamps for RealAudio packets.
      intelh263dec: aspect ratio processing fix.
      intelh263dec: fix "Strict H.263 compliance"  file playback
      oss,sndio: simplify by using FFMIN.
      swscale: extract monowhite/black output from yuv2packed[12X]_c().
      swscale: de-macro'ify RGB15/16/32 input functions.
      swscale: rearrange code.
      movdec: Add support for the 'wfex' atom.
      ffmpeg.c: Add a necessary const qualifier
      riff: Fix potential memleak.
      swscale: change 48bit RGB input macros to inline functions.
      swscale: change 9/10bit YUV input macros to inline functions.
      swscale: extract gray16 output functions from yuv2packed[12X]().
      swscale: use standard clipping functions.
      swscale: merge macros that are used only once.
      swscale: fix function declarations in swscale.c.
      swscale: fix function declaration keywords in x86/swscale_template.c.
    
    Conflicts:
    	ffmpeg.c
    	libavcodec/intelh263dec.c
    	libswscale/swscale.c
    	libswscale/x86/swscale_template.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2ec77aae
intelh263dec.c 4.48 KB