• Michael Niedermayer's avatar
    Merge commit 'f5962229' · 15ef1cfe
    Michael Niedermayer authored
    * commit 'f5962229':
      avplay: use audio parameters from the decoded frame instead of AVCodecContext
      dca: allocate a secondary buffer for extra channels when downmixing
      configure: use utilities from /usr/xpg4/bin if it exists
      avstring-test: fix memory leaks
    
    Conflicts:
    	ffplay.c
    	libavcodec/dcadec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    15ef1cfe
avstring.c 5.64 KB