[FFmpeg-cvslog] Merge commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May 12 14:31:59 2013 +0200| [93f80cf2cc506aa597283bf38d670496d594c09f] | committer: Michael Niedermayer

Merge commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb' into release/1.1

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=93f80cf2cc506aa597283bf38d670496d594c09f
---