diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-02 00:52:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-02 00:52:23 +0200 |
| commit | 976d173606769e09442d1ab2ca1436ffd96a35be (patch) | |
| tree | 1b3a8716960300c939d8cd71dc29f361ff91e920 /libavformat/rtpenc_aac.c | |
| parent | f9bdc93723cc38f91de68d364854e7fa6b5857eb (diff) | |
| parent | 989431c02ffcfdeb210cf42765e820130eb4b255 (diff) | |
| download | ffmpeg-976d173606769e09442d1ab2ca1436ffd96a35be.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
* qatar/release/0.8:
id3v2: fix skipping extended header in id3v2.4
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc_aac.c')
0 files changed, 0 insertions, 0 deletions