diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-23 19:01:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-23 19:01:12 +0200 |
| commit | c867be03f61ebce3b87033137d0012a660b8ff75 (patch) | |
| tree | 0d09d51860def1ceab2bb087ac60af2604aa02cd /doc/ffprobe.xsd | |
| parent | 6a4832caaede15e3d918b1408ff83fe30324507b (diff) | |
| parent | 6b7b8585d73548f08b98959df39d80b97677662f (diff) | |
| download | ffmpeg-c867be03f61ebce3b87033137d0012a660b8ff75.tar.gz | |
Merge commit '6b7b8585d73548f08b98959df39d80b97677662f'
* commit '6b7b8585d73548f08b98959df39d80b97677662f':
dca: Convert dca_dmixtable to integers
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffprobe.xsd')
0 files changed, 0 insertions, 0 deletions