diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-16 02:18:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-16 02:18:58 +0100 |
| commit | 1db87da35141c34474644c677bad2cf3a408611d (patch) | |
| tree | fe8223c22f7617eb782d2e31918164937d32fe33 /doc/doxy-wrapper.sh | |
| parent | a2bc6c116ddc15af47e092af874a0647d114a9f6 (diff) | |
| parent | 9cd4bc41760f8ad879e248920eacbe1e7757152c (diff) | |
| download | ffmpeg-1db87da35141c34474644c677bad2cf3a408611d.tar.gz | |
Merge commit '9cd4bc41760f8ad879e248920eacbe1e7757152c'
* commit '9cd4bc41760f8ad879e248920eacbe1e7757152c':
ac3dec: set AV_FRAME_DATA_DOWNMIX_INFO side data.
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/doxy-wrapper.sh')
0 files changed, 0 insertions, 0 deletions