diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 20:51:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 20:51:39 +0200 |
| commit | 42196083fe6336095d113f2e2da80fe6660519c7 (patch) | |
| tree | 2aa34bf1e1ad384c933ca47b8077ba3afb1f6c32 /libavcodec/adpcm.c | |
| parent | a59d922d24883aabb3d43901aba876495a4e9430 (diff) | |
| parent | 404731bd20e1df5880e6fe381e975ba48afc75b2 (diff) | |
| download | ffmpeg-42196083fe6336095d113f2e2da80fe6660519c7.tar.gz | |
Merge commit '404731bd20e1df5880e6fe381e975ba48afc75b2'
* commit '404731bd20e1df5880e6fe381e975ba48afc75b2':
pulse: Set the wallclock option as default
Conflicts:
libavdevice/pulse_audio_dec.c
No change, the option was already default in FFmpeg since a long time
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm.c')
0 files changed, 0 insertions, 0 deletions