diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 02:33:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 02:35:23 +0100 |
| commit | 72df87088c8a6593d66b207140edd32b4d2fb6ee (patch) | |
| tree | 627f4074de47307e4d22564f82ee85f614a44e09 /libavfilter/asrc_sine.c | |
| parent | 4362f272c0ae280cde833589e5c9c6696bd878d5 (diff) | |
| parent | 508b37557bf36eae83c18e64d42f27b44a321d81 (diff) | |
| download | ffmpeg-72df87088c8a6593d66b207140edd32b4d2fb6ee.tar.gz | |
Merge commit '508b37557bf36eae83c18e64d42f27b44a321d81'
* commit '508b37557bf36eae83c18e64d42f27b44a321d81':
tiertexseqv: use the AVFrame API properly.
smc: use the AVFrame API properly.
truemotion2: use the AVFrame API properly.
truemotion1: use the AVFrame API properly.
Conflicts:
libavcodec/smc.c
libavcodec/tiertexseqv.c
libavcodec/truemotion1.c
libavcodec/truemotion2.c
See: e999f2339ab0200039ee7123b75d79a52aaac5d1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/asrc_sine.c')
0 files changed, 0 insertions, 0 deletions