diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 14:39:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 14:41:23 +0100 |
| commit | 3773738e26c9480a9ebdada54016dd2687c66774 (patch) | |
| tree | 6c3c25d46b223b157afb0755fb1c188adc240ff1 /libavcodec/avpacket.c | |
| parent | 7904dfed7370125c04f243d284c27b0e61015533 (diff) | |
| parent | ca96e337169093979d7c763064ad9dae12b3108c (diff) | |
| download | ffmpeg-3773738e26c9480a9ebdada54016dd2687c66774.tar.gz | |
Merge commit 'ca96e337169093979d7c763064ad9dae12b3108c'
* commit 'ca96e337169093979d7c763064ad9dae12b3108c':
vp9: drop support for real (non-emulated) edges
Conflicts:
libavcodec/vp9block.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avpacket.c')
0 files changed, 0 insertions, 0 deletions