diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 17:18:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 17:18:52 +0100 |
| commit | 6d648dcfc9e30c9cf47ec7d9842e54cb1c9c1da8 (patch) | |
| tree | da3e51458283183402484308d9f89e6399c454a5 /libavformat/icoenc.c | |
| parent | 51268aaed245f6cc7252e5e3692e00e13963d601 (diff) | |
| parent | 76267ecc82e3018e1913a2483d5fc47d0949cbd8 (diff) | |
| download | ffmpeg-6d648dcfc9e30c9cf47ec7d9842e54cb1c9c1da8.tar.gz | |
Merge commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8'
* commit '76267ecc82e3018e1913a2483d5fc47d0949cbd8':
http: Remove an unrelated and mistakenly set AVOption unit name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/icoenc.c')
0 files changed, 0 insertions, 0 deletions