diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-06 12:08:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-06 12:08:43 +0200 |
| commit | 98277fd1a0f7e153216bbbf62eab7c1d4f88b508 (patch) | |
| tree | d66be946ab7fa9e06ee23f6d9b997c4175da84c4 /libavdevice/alsa-audio.h | |
| parent | 0844630e6b01b71ed9dd50158b94d2833f7f8269 (diff) | |
| parent | 4972e5a186fe8c0552869f793982627d1b318306 (diff) | |
| download | ffmpeg-98277fd1a0f7e153216bbbf62eab7c1d4f88b508.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
bitstream_filter: K&R formatting cosmetics
Conflicts:
libavcodec/bitstream_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alsa-audio.h')
0 files changed, 0 insertions, 0 deletions