• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 8551c6be
    Michael Niedermayer authored
    * qatar/master:
      dv1394: Swap the min and max values of the 'standard' option
      rtpdec_vp8: Don't parse fields that aren't used
      lavc: add some AVPacket doxy.
      audiointerleave: deobfuscate a function call.
      rtpdec: factorize identical code used in several handlers
      a64: remove interleaved mode.
      doc: Point to the new location of the c99-to-c89 tool
      decode_audio3: initialize AVFrame
      ws-snd1: set channel layout
      wmavoice: set channel layout
      wmapro: use AVCodecContext.channels instead of keeping a private copy
      wma: do not keep private copies of some AVCodecContext fields
    
    Conflicts:
    	libavcodec/wmadec.c
    	libavcodec/wmaenc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    8551c6be
wmavoice.c 80.8 KB