diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 12:36:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 12:36:29 +0200 |
| commit | 05deb05fe9ce28cc7b9951446edfaabc364b0b88 (patch) | |
| tree | 6e03a0ede6c6285de9eccb86faabedb258534ba7 /libavformat/pcmenc.c | |
| parent | 52e40155a8e1f41b2d97e5832022263b77752f32 (diff) | |
| parent | a3bf80a5aea577663354bd538e345b283bcb73de (diff) | |
| download | ffmpeg-05deb05fe9ce28cc7b9951446edfaabc364b0b88.tar.gz | |
Merge commit 'a3bf80a5aea577663354bd538e345b283bcb73de'
* commit 'a3bf80a5aea577663354bd538e345b283bcb73de':
riff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guid
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/pcmenc.c')
0 files changed, 0 insertions, 0 deletions