diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-28 00:48:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-28 02:38:33 +0100 |
| commit | 0e5fbbd7768a6eb42809c08a5dd46093caf407d3 (patch) | |
| tree | e559aec3cdf6f48bb9774fb0cf4bb51b270cda70 /libavcodec/g722dec.c | |
| parent | ad1c50255735c20bd86572d3e8b3c88a5ca6c8f1 (diff) | |
| parent | bd96be6e2739dbe5b7a467a318ebfb6241c15eba (diff) | |
| download | ffmpeg-0e5fbbd7768a6eb42809c08a5dd46093caf407d3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo_enc: K&R cosmetics
doxygen: remove unreplaced variables from custom header and footer
threads: test for sys/param.h and include it for sysctl on OpenBSD
v4l2: remove unneded linux specific asm/types.h include
x86: Fix constraints for decode_significance*_x86
Conflicts:
libavcodec/mpegvideo_enc.c
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722dec.c')
0 files changed, 0 insertions, 0 deletions