diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-26 12:05:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-26 12:22:55 +0200 |
| commit | d5ee74e57d44ccbf644ea76d635628ed4e5fabfb (patch) | |
| tree | 66355b6853c81a13bcce9573e94e7821eaef8c01 /libavcodec/g723_1.c | |
| parent | c2c56d54ee900867690e71e5154593c907229061 (diff) | |
| parent | ab56fabe6294524e99815451ad01e4ff50c6d734 (diff) | |
| download | ffmpeg-d5ee74e57d44ccbf644ea76d635628ed4e5fabfb.tar.gz | |
Merge commit 'ab56fabe6294524e99815451ad01e4ff50c6d734'
* commit 'ab56fabe6294524e99815451ad01e4ff50c6d734':
vfwcap: Add fallback define for HWND_MESSAGE
The merged commit reverts the HWND_MESSAGE removial, and adds a #ifndef around
commit 8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2
vfwcap: Drop fallback VfW defines
The defines were added long ago when MinGW still lacked them.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g723_1.c')
0 files changed, 0 insertions, 0 deletions