diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-13 12:23:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-13 12:23:48 +0100 |
| commit | 7897919a88cd4be607497a367203e55fe11df9f0 (patch) | |
| tree | 56727965b7a38e52c63962a1a794b575d991437b /libavformat/oggparsevorbis.c | |
| parent | 2e5e2bf935ae91b3113f480086c0652f17935b0c (diff) | |
| parent | 6d5b0092678b2a95dfe209a207550bd2fe9ef646 (diff) | |
| download | ffmpeg-7897919a88cd4be607497a367203e55fe11df9f0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN.
x86inc: fix stack alignment on win64
rtpproto: Remove unused defines
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparsevorbis.c')
0 files changed, 0 insertions, 0 deletions