diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 02:46:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 02:47:20 +0100 |
| commit | c97c7c2adf408fd187b39ca19dcad35eddae1394 (patch) | |
| tree | 8215350a6b41a26d8d9041e594e6b927ed8e5e40 /libavcodec/adpcm_data.c | |
| parent | 1fc74926a5d13261721e1c9962c48db00d214853 (diff) | |
| parent | f53e274f4cd284eb71fbba6e9a1bc2f951941e0e (diff) | |
| download | ffmpeg-c97c7c2adf408fd187b39ca19dcad35eddae1394.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Fix project name typo
Merge for metadata only
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm_data.c')
0 files changed, 0 insertions, 0 deletions