Merge commit 'fc6825ebb6585138e8ee2bb3484a04542c5d8b6a' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 10:41:03 +0000 (12:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 10:41:03 +0000 (12:41 +0200)
commit1ace588f4a94fa607a42971b59483447647c4727
tree3101a09642a0d5fbffa5dddc7af2fdc82a0885a2
parent50a3442120e685963649417a6455ce90cf45b653
parentfc6825ebb6585138e8ee2bb3484a04542c5d8b6a
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@gmx.at>
configure
libavcodec/vp8.c
libavformat/flvdec.c