diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-20 13:34:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-20 13:34:27 +0100 |
| commit | 70c0f13a9a40323456d8810a7a1ee0a6256c3384 (patch) | |
| tree | 342bb51679733769271a1c441d98cb9d504d225e /libavformat/asfcrypt.c | |
| parent | da8242e2d6f85d95239082efd0e5e2345e685a2c (diff) | |
| parent | 7c278d2ae410a64bdd89f1777026b4b963c30a1a (diff) | |
Merge commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a'
* commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a':
alacenc: support 24-bit encoding
pcmdec: use planar sample format for pcm_s16le_planar
vorbisdec: use float planar sample format
Conflicts:
libavcodec/pcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asfcrypt.c')
0 files changed, 0 insertions, 0 deletions