diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-29 11:01:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-29 11:02:25 +0100 |
| commit | 774a2684973ef66d80b77e657d3fe28e3f37c496 (patch) | |
| tree | b8356bb91fb03f8c09fc7f9767edaed84611768a /libavutil/xtea.c | |
| parent | 8ed9d34aa7f0002d46fa78bbda58a816edaf1169 (diff) | |
| parent | e46a2a7309d8e8b8c1573047731dea77695d0ce1 (diff) | |
| download | ffmpeg-774a2684973ef66d80b77e657d3fe28e3f37c496.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
flvdec: read audio sample size and channels metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/xtea.c')
0 files changed, 0 insertions, 0 deletions