diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-23 13:21:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-23 13:21:21 +0200 |
| commit | 780b1aa1efa872ec7401735764795134427db1ab (patch) | |
| tree | 5499815afacb4c31b2d5611c1d712110c92fc4e7 /libavcodec/dvdsubenc.c | |
| parent | cc61ef0479f07ddb9f22cbf3fa9ca28d6fd0cf72 (diff) | |
| parent | f963f701d90bd7bb03e39aab4e59bd137084e082 (diff) | |
| download | ffmpeg-780b1aa1efa872ec7401735764795134427db1ab.tar.gz | |
Merge commit 'f963f701d90bd7bb03e39aab4e59bd137084e082'
* commit 'f963f701d90bd7bb03e39aab4e59bd137084e082':
ogg: relax demuxer conformance checks
Conflicts:
libavformat/oggdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvdsubenc.c')
0 files changed, 0 insertions, 0 deletions