diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-25 15:11:23 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-25 15:11:23 +0400 |
| commit | 859413b66daf68402e73e6afa8f888581998f7ed (patch) | |
| tree | 7124a278835635a85ce1f180aa1cdd66eb9c0c6d | |
| parent | 2904d052b7ca8714fda5c039c958bc0a0ae40877 (diff) | |
| parent | 58e65e44f435243dc72dfce1f8af8afcf1319f34 (diff) | |
Merge commit '58e65e44f435243dc72dfce1f8af8afcf1319f34'
* commit '58e65e44f435243dc72dfce1f8af8afcf1319f34':
vc1dsp: Add wrappers for {avg|put}_vc1_mspel_mc00_c
Conflicts:
libavcodec/vc1dsp.c
See: 319235c67c59d6abaa78d5af57121ab9816f937d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions