diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 12:53:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 12:53:58 +0200 |
| commit | 645d0384e85bb40b2307c559d0cfc914438e5bff (patch) | |
| tree | b5027c9055731c5ecc6063a258bd98aef1a94f57 /libavformat/icoenc.c | |
| parent | 51286aaffcad24c1ee134bbcea5202e7e5950cc8 (diff) | |
| parent | b845f5e97b655de0a191f736594777fec9754cf5 (diff) | |
| download | ffmpeg-645d0384e85bb40b2307c559d0cfc914438e5bff.tar.gz | |
Merge commit 'b845f5e97b655de0a191f736594777fec9754cf5'
* commit 'b845f5e97b655de0a191f736594777fec9754cf5':
riff: Factor out WAVEFORMATEX parsing
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/icoenc.c')
0 files changed, 0 insertions, 0 deletions