diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 04:29:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 04:29:54 +0100 |
| commit | 1cc9468289b266e4a8ff62d520be832f103f0afa (patch) | |
| tree | 9114befa21979cd4ffe0253152214ac01e3e17a8 /libavcodec/atrac3plusdec.c | |
| parent | 76a939d0e58c256d5a340c8a7776eba2c83ff6d2 (diff) | |
| parent | ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab (diff) | |
| download | ffmpeg-1cc9468289b266e4a8ff62d520be832f103f0afa.tar.gz | |
Merge commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab'
* commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab':
http: Always allow no-op seek
Conflicts:
libavformat/http.c
See: 857841c1b63bf3ffacef03da2bd6275d55ead769
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/atrac3plusdec.c')
0 files changed, 0 insertions, 0 deletions