diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:21:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:21:43 +0100 |
| commit | 1c60956c80376884502e797f613ec24cacba3cce (patch) | |
| tree | 1618cd51870a2fc2c6a1fe312b457a0cf75fd709 /libavformat/matroska.c | |
| parent | ac45921a6b9dfbd3074c8a760038eca5a40eb05d (diff) | |
| parent | c7e044c61bb08b3a6e1e8063e8f4449c88b01201 (diff) | |
| download | ffmpeg-1c60956c80376884502e797f613ec24cacba3cce.tar.gz | |
Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201'
* commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201':
lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft
Conflicts:
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.c')
0 files changed, 0 insertions, 0 deletions