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

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May 12 12:41:03 2013 +0200| [1ace588f4a94fa607a42971b59483447647c4727] | committer: Michael Niedermayer

Merge commit 'fc6825ebb6585138e8ee2bb3484a04542c5d8b6a' into release/1.1

* commit 'fc6825ebb6585138e8ee2bb3484a04542c5d8b6a':
  vp8: Fix pthread_cond and pthread_mutex leaks
  configure: Refactor dxva2api.h dependency declarations
  flvdec: read audio sample size and channels metadata
  flvdec: use the correct audio codec id when parsing metadata

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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