diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 09:19:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 09:19:11 +0200 |
| commit | 0d83b5722e2875cd4a2ac3574af72b5be633c73d (patch) | |
| tree | 4d42d5d60b334b4cbe13188c97005c7634d58135 /libavdevice/alsa-audio-common.c | |
| parent | 4390fa6273e603f17a2c7244a5de0d8e36397f59 (diff) | |
| parent | 9cacdabd1c8cd257a942d8289349c37d992989b7 (diff) | |
| download | ffmpeg-0d83b5722e2875cd4a2ac3574af72b5be633c73d.tar.gz | |
Merge commit '9cacdabd1c8cd257a942d8289349c37d992989b7'
* commit '9cacdabd1c8cd257a942d8289349c37d992989b7':
jpegls: cosmetics: Drop some unnecessary parentheses
mpegvideo: Remove commented-out PARANOID debug cruft
Conflicts:
libavcodec/jpegls.c
libavcodec/mpegvideo.c
libavcodec/x86/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alsa-audio-common.c')
0 files changed, 0 insertions, 0 deletions