diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 13:56:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 13:56:56 +0200 |
| commit | 93318983c3e565b3079362ec69cf3362febc5004 (patch) | |
| tree | 52535077257899903db9906d27e618a4734a2f62 /libavfilter/asrc_sine.c | |
| parent | 4a30f08505a4e85718896ff233c97be41a9754ca (diff) | |
| parent | 04db5794cd97e4b33ec2f963ef7f967722a456eb (diff) | |
| download | ffmpeg-93318983c3e565b3079362ec69cf3362febc5004.tar.gz | |
Merge commit '04db5794cd97e4b33ec2f963ef7f967722a456eb'
* commit '04db5794cd97e4b33ec2f963ef7f967722a456eb':
hevc: templatize pred_planar
Conflicts:
libavcodec/hevcpred_template.c
See: 053fdacde76a38186dc9db658572e38686efe0c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/asrc_sine.c')
0 files changed, 0 insertions, 0 deletions