diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 12:41:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 12:41:03 +0200 |
| commit | 1ace588f4a94fa607a42971b59483447647c4727 (patch) | |
| tree | 3101a09642a0d5fbffa5dddc7af2fdc82a0885a2 /libavresample/utils.c | |
| parent | 50a3442120e685963649417a6455ce90cf45b653 (diff) | |
| parent | fc6825ebb6585138e8ee2bb3484a04542c5d8b6a (diff) | |
| download | ffmpeg-1ace588f4a94fa607a42971b59483447647c4727.tar.gz | |
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>
Diffstat (limited to 'libavresample/utils.c')
0 files changed, 0 insertions, 0 deletions