diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 12:08:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 12:08:21 +0100 |
| commit | bb116e6ba39ff908a6d92991a749a1cabc85fe28 (patch) | |
| tree | c265c602f0bbfb52c2e463f61e359605a07bbb03 /libavformat/caf.h | |
| parent | ebe356bf1cc94a8152649dc358ed13e0188d4dda (diff) | |
| parent | d37fac6dbbdddb76225aa691b83ffd9a0c7dae6b (diff) | |
| download | ffmpeg-bb116e6ba39ff908a6d92991a749a1cabc85fe28.tar.gz | |
Merge commit 'd37fac6dbbdddb76225aa691b83ffd9a0c7dae6b' into release/2.2
* commit 'd37fac6dbbdddb76225aa691b83ffd9a0c7dae6b':
isom: lpcm in mov default to big endian
movdec: handle 0x7fff langcode as macintosh per the specs
No change as these have been part of the branch previously
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/caf.h')
0 files changed, 0 insertions, 0 deletions