diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-21 15:27:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-21 15:27:02 +0200 |
| commit | ff96098084542c3ef98b360f70583999433d13a7 (patch) | |
| tree | 620b6e7702ddbc0fb1ccc3525299feb0781abfca /libavcodec/roqvideodec.c | |
| parent | 34c997599e14b4ef5f84aa324fdea7ae03d7a2ba (diff) | |
| parent | ccb919e34b1276db5cfcd903e405e47ccb932d58 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
WavPack demuxer: do not rely on index when timestamp is not in indexed range.
WavPack demuxer: store position of the first block in index.
WavPack decoder: implement flush function
avconv: Separate initialization from the main transcode loop.
Conflicts:
avconv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/roqvideodec.c')
0 files changed, 0 insertions, 0 deletions