• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 00c0465d
    Michael Niedermayer authored
    * qatar/master:
      fate: split off DPCM codec FATE tests into their own file
      fate: split off PCM codec FATE tests into their own file
      libvorbis: K&R reformatting cosmetics
      libmp3lame: K&R formatting cosmetics
      fate: Add a video test for xxan decoder
      mpegvideo_enc: K&R cosmetics (line 1000-2000).
      avconv: K&R cosmetics
      qt-faststart: Fix up indentation
      indeo4: remove two unused variables
      doxygen: cleanup style to support older doxy
      fate: add more tests for VC-1 decoder
      applehttpproto: Apply the same reload interval changes as for the demuxer
      applehttp: Use half the target duration as interval if the playlist didn't update
      applehttp: Use the last segment duration as reload interval
      lagarith: add decode support for arith rgb24 mode
    
    Conflicts:
    	avconv.c
    	libavcodec/libmp3lame.c
    	libavcodec/mpegvideo_enc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    00c0465d
ffmpeg.c 188 KB