• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 70713859
    Michael Niedermayer authored
    * qatar/master:
      adpcmenc: cosmetics: pretty-printing
      ac3dec: cosmetics: pretty-printing
      yuv4mpeg: cosmetics: pretty-printing
      shorten: remove dead initialization
      roqvideodec: set AVFrame reference before reget_buffer.
      bmp: fix some 1bit samples.
      latmdec: add fate test for audio config change
      oma: PCM support
      oma: better format detection with small probe buffer
      oma: clearify ambiguous if condition
      wavpack: Properly clip samples during lossy decode
      Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.
      Cleaned pixdesc.c file in libavutil
      zmbv.c: coding style clean-up.
      xan.c: coding style clean-up.
      mpegvideo.c: code cleanup - first 500 lines.
    
    Conflicts:
    	Changelog
    	libavcodec/adpcmenc.c
    	libavcodec/bmp.c
    	libavcodec/zmbv.c
    	libavutil/log.c
    	libavutil/pixdesc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    70713859
mpegvideo.c 104 KB