diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:56:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:56:19 +0100 |
| commit | e727cbf0be206e4fe48776735c44b9cdfa96b332 (patch) | |
| tree | b9ad0a2de171d62d5c570ba4363e71ca224fa100 /libavformat/aiffenc.c | |
| parent | bcc25353cf259ee63df4c2147630259cd90c8cd5 (diff) | |
| parent | f859fed03d5d039430baea03a0ef35cfd6ac4abd (diff) | |
| download | ffmpeg-e727cbf0be206e4fe48776735c44b9cdfa96b332.tar.gz | |
Merge commit 'f859fed03d5d039430baea03a0ef35cfd6ac4abd' into release/2.2
* commit 'f859fed03d5d039430baea03a0ef35cfd6ac4abd':
http: Always allow no-op seek
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aiffenc.c')
0 files changed, 0 insertions, 0 deletions