diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-11 22:37:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-11 23:02:41 +0100 |
| commit | 852dcf336bc553c906135bfa3dca559b5cf5c26f (patch) | |
| tree | 969df01c257dca3da2738f147ab9a66335a017e6 /libavcodec/wavpack.c | |
| parent | 6c12b1de064d2604d19cb4c238a788cfed9679ac (diff) | |
| parent | d6d78518018a12fb495baab5663708a830f3aab6 (diff) | |
| download | ffmpeg-852dcf336bc553c906135bfa3dca559b5cf5c26f.tar.gz | |
Merge commit 'd6d78518018a12fb495baab5663708a830f3aab6'
* commit 'd6d78518018a12fb495baab5663708a830f3aab6':
g2meet: factor out seeking to the chunk end
Conflicts:
libavcodec/g2meet.c
See: 3f826039ddccdd7840cdf982a1a61cb11121a5a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wavpack.c')
0 files changed, 0 insertions, 0 deletions