Merge commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 12:31:59 +0000 (14:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 12:31:59 +0000 (14:31 +0200)
* commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb':
  lavc: Fix assignments in if() when calling ff_af_queue_add
  wav: Always seek to an even offset
  swscale: Use alpha from the right row in yuva2rgba_c
  Prepare for 9.6 Release

Conflicts:
RELEASE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/wavdec.c
libswscale/yuv2rgb.c

Simple merge
Simple merge