• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 799d749c
    Michael Niedermayer authored
    * qatar/master: (24 commits)
      yop: set channel layout
      wtv: set channel layout for mpeg audio
      westwood_aud: set channel layout
      wc3movie: set channel layout
      tmv: set channel layout
      tiertexseq: set channel layout
      swfdec: set channel layout
      sol: set channel layout
      smacker: set channel layout
      siff: set channel layout
      sierravmd: set channel layout
      rtpdec_amr: set channel layout
      rsodec: set channel layout
      rmdec: set channel layout for RA version 3
      qcp: set channel layout
      psxstr: set channel layout
      omadec: set channel layout
      oggparsespeex: validate channel count and set channel layout
      nuv: set channel layout
      mxg: set channel layout
      ...
    
    Conflicts:
    	libavformat/swfdec.c
    	libavformat/wtv.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    799d749c
wtvdec.c 39 KB