diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 21:07:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 21:08:05 +0200 |
| commit | 30e9ebb14f197bbc3fcbde467da39d1a79ac8d52 (patch) | |
| tree | 5d10386c06d6d0793951bc5179770244ed33f676 /libavfilter/af_pan.c | |
| parent | f399f826ee2d1e55bdae1495db9c1885589e4de1 (diff) | |
| parent | 05bf3f54e6078716f6267df530bf1d474ca3d606 (diff) | |
| download | ffmpeg-30e9ebb14f197bbc3fcbde467da39d1a79ac8d52.tar.gz | |
Merge commit '05bf3f54e6078716f6267df530bf1d474ca3d606'
* commit '05bf3f54e6078716f6267df530bf1d474ca3d606':
libvpx: Do not set vp8 only parameters when encoding in vp9
Conflicts:
libavcodec/libvpxenc.c
See: 238ec505e263e7d0363798a05c1c28f494a6300a
See: ae330070ee8b985abb011835502b03baacfbb18c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_pan.c')
0 files changed, 0 insertions, 0 deletions