diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 18:29:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 22:03:27 +0100 |
| commit | d5d29ae3b0375320a7a34f85a5a90e8362550dbb (patch) | |
| tree | 233817ceb5d6003890e65a142bc485fadc01f608 /libavcodec/adpcm_data.c | |
| parent | ef7f7516426ebf4fdb28420925f52ada61457598 (diff) | |
| parent | 57f13fd7e993ee0b582695c7af7a6bdf1c7d0761 (diff) | |
| download | ffmpeg-d5d29ae3b0375320a7a34f85a5a90e8362550dbb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dv_tablegen: Remove CONFIG_SMALL preprocessor check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm_data.c')
0 files changed, 0 insertions, 0 deletions