diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-02 02:19:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-02 02:19:17 +0200 |
| commit | 113ca1b8db8f4b76568e40cadfd314d6ab64623c (patch) | |
| tree | 2fb4158b12062cf6349a9ad7fd17f5ef33425691 /ffmpeg.c | |
| parent | 1014e20492d529ba165227a5376d9199a4e24175 (diff) | |
| parent | f70c720d42d0e222b70fc580a36832a7b0ef89fa (diff) | |
| download | ffmpeg-113ca1b8db8f4b76568e40cadfd314d6ab64623c.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.6' into release/0.6
* qatar/release/0.6:
id3v2: fix skipping extended header in id3v2.4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions