• Michael Niedermayer's avatar
    Merge commit 'ef1b23ad' · 7eb40d85
    Michael Niedermayer authored
    * commit 'ef1b23ad': (21 commits)
      jvdec: set channel layout
      iss: set channel layout
      ipmovie: set channel layout
      iff: set channel layout
      idroqdec: set channel layout
      gxfdec: set channel layout when applicable
      gsmdec: set channel layout
      flvdec: set channel layout
      dv: set channel layout
      dsicin: set channel layout
      daud: set channel layout
      cdxl: set channel layout
      bmv: set channel layout
      bink: set channel layout
      bfi: set channel layout
      bethsoftvid: set channel layout
      apc: set channel layout
      amr: set channel_layout
      ppc: replace pointer casting with AV_COPY32
      ppc: fix some unused variable warnings
      ...
    
    Conflicts:
    	libavformat/amr.c
    	libavformat/iff.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7eb40d85
bethsoftvid.c 9.81 KB