diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-17 22:28:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-17 22:28:28 +0200 |
| commit | 6ca48ad044e690c43985aa380cb474f1a3df7b4e (patch) | |
| tree | 47a311223209a8edd05242cf417d6b6c61bd83b6 /tests/ref/fate/adpcm-creative-8-2bit | |
| parent | 54101214d89382a24518f21a30080631a981c798 (diff) | |
| parent | 5f26d4d44896542e729c7515c784d983e396106a (diff) | |
| download | ffmpeg-6ca48ad044e690c43985aa380cb474f1a3df7b4e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
amr: Cosmetic cleanup
mov_chan: Fix operator precedence by adding parentheses
doc: Add missing protocols to list of supported protocols.
tcp: Check the listen call
Conflicts:
libavformat/amr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/adpcm-creative-8-2bit')
0 files changed, 0 insertions, 0 deletions