diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 13:34:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 13:34:39 +0100 |
| commit | 198e55bfa791943fdd477778a8b39180dab52912 (patch) | |
| tree | 50ee89ea653c0584afe63f2df72b19292f480f90 /libavcodec/jpeglsdec.h | |
| parent | b882079b1265066e5cc7c4415322919bea4c4651 (diff) | |
| parent | 5aa710f46119bb9c1c38542f80f5338eb8b5ffb2 (diff) | |
| download | ffmpeg-198e55bfa791943fdd477778a8b39180dab52912.tar.gz | |
Merge commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2'
* commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2':
vorbisenc: add missing parenthesis
Conflicts:
libavcodec/vorbisenc.c
See: f72b735d41f9591452d2efe0987040462b409c2d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeglsdec.h')
0 files changed, 0 insertions, 0 deletions