diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 12:59:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 13:02:20 +0100 |
| commit | 30ee4b3393eb1ae69c5eb8de87a5773593b3c6bb (patch) | |
| tree | 4ffadd54bd430504743bcb6893977fd977e815de /libavformat/rso.h | |
| parent | 551a679795629ece44dc01efbb340bc59e015459 (diff) | |
| parent | 35686a289fcd2f9d7502e45002f168a753b11f9c (diff) | |
| download | ffmpeg-30ee4b3393eb1ae69c5eb8de87a5773593b3c6bb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mp3adu: Set the channel layout properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rso.h')
0 files changed, 0 insertions, 0 deletions