diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-31 14:27:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-31 14:27:51 +0100 |
| commit | 045214e3d98157d173284e10c412f3976cc55b35 (patch) | |
| tree | 89adfd81d92361df2c9d9a7ba36bb0a78280a2c3 /libavcodec/acelp_pitch_delay.c | |
| parent | 532ca12300f149a91090270ac733c52c4573ec88 (diff) | |
| parent | e4b0a77021a25fd538ef14791e31c06950d5ff1f (diff) | |
| download | ffmpeg-045214e3d98157d173284e10c412f3976cc55b35.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
libavfilter/decimate: Add pts of first frame to all frames.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/acelp_pitch_delay.c')
0 files changed, 0 insertions, 0 deletions