diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-12 16:36:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-12 16:36:15 +0100 |
| commit | 3e8b17f05b916087755e79545e63d92ae6323a05 (patch) | |
| tree | d1b9d75769a1fbc2127c08850f9c7c8bd7dffe71 /libavformat/hlsenc.c | |
| parent | f73901f815d0c6e1e9dbe6d8541e43d633b06d63 (diff) | |
| parent | f5d92d9cab07429b084c88262d9af1735ac8914a (diff) | |
| download | ffmpeg-3e8b17f05b916087755e79545e63d92ae6323a05.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
asfdec: fix seeking with fragmented packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hlsenc.c')
0 files changed, 0 insertions, 0 deletions