diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 12:29:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 12:31:15 +0200 |
| commit | e82071e7279ab8d8ec138753822222a6cff26f35 (patch) | |
| tree | 7839a057f4d26a05ee6ddd080719263a22fe81c4 /libavcodec/avcodec.h | |
| parent | 72eddc10fa1f3ca7fb95292673fa26401f754c92 (diff) | |
| parent | 839df90c718dcab9b9e91ca3c7e73479b3e8103c (diff) | |
| download | ffmpeg-e82071e7279ab8d8ec138753822222a6cff26f35.tar.gz | |
Merge commit '839df90c718dcab9b9e91ca3c7e73479b3e8103c'
* commit '839df90c718dcab9b9e91ca3c7e73479b3e8103c':
lxf: Support 16-channel files
lxf: Support version 1 files
Conflicts:
libavformat/lxfdec.c
See: e701b0cf7553202085840d3bfd1aff432b4de513
See: 1a06d6dd866318b49596c0bf5ed03917f952d3bd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
0 files changed, 0 insertions, 0 deletions