diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 13:07:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 13:07:25 +0100 |
| commit | 91da6b97c7fb13322faf3dc7f6f895a3e363cdee (patch) | |
| tree | 2ef20ebe1e2b9ab77b03766b70945be5c1bc4e5c /libavfilter/asrc_aevalsrc.c | |
| parent | b563afe6fa9345a62750055998a28a3926c02334 (diff) | |
| parent | 76c40fbef06aaf5013450a4b51dd3c49955777a1 (diff) | |
| download | ffmpeg-91da6b97c7fb13322faf3dc7f6f895a3e363cdee.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec_vp8: Don't trim too much data from broken frames
rtpdec_vp8: Simplify code by using an existing helper function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/asrc_aevalsrc.c')
0 files changed, 0 insertions, 0 deletions