diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-31 11:01:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-31 11:01:30 +0200 |
| commit | 95960027a59fe38ad01a1429b85f9b3aa8fa2432 (patch) | |
| tree | 590f2c7b65c2badc0632dc06b9819a9b0a575f07 /libavcodec/libxvid.c | |
| parent | 38536e59275052b89755c6ee806642ce27055009 (diff) | |
| parent | 9696740af715e50ef7098272e56e154826caa332 (diff) | |
| download | ffmpeg-95960027a59fe38ad01a1429b85f9b3aa8fa2432.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hls: Call avformat_find_stream_info() on the chained demuxers
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libxvid.c')
0 files changed, 0 insertions, 0 deletions