diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-02 02:25:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-02 02:25:49 +0200 |
| commit | 0fda37cff9470c602fd59366ac4250a9a4eae6b1 (patch) | |
| tree | 6ef48a53c6a992abbd7a68d10a4751e2bafa95ab /libavformat/nsvdec.c | |
| parent | 8e101086ebbf73f6ef0756ace3e1b42ecbb1eff2 (diff) | |
| parent | 2e693be7e9b1a70360dd6849a58fae74b16afba1 (diff) | |
| download | ffmpeg-0fda37cff9470c602fd59366ac4250a9a4eae6b1.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.5' into release/0.5
* qatar/release/0.5:
id3v2: fix skipping extended header in id3v2.4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nsvdec.c')
0 files changed, 0 insertions, 0 deletions