diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 13:59:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 14:00:21 +0100 |
| commit | 53c2f401f726732e56343377452e487c8c6a0ee1 (patch) | |
| tree | d472c200b5b6e28c0f14c22194e80fc1fc37e833 /libavcodec/jpeglsdec.c | |
| parent | 41bdef1d39584727c9deaa42b86d085138098231 (diff) | |
| parent | 246da0b13551b1f80f067e4f258e5bd691f5ab33 (diff) | |
Merge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33'
* commit '246da0b13551b1f80f067e4f258e5bd691f5ab33':
v4l2: avoid pointless indirection.
vdpau: Add VC-1 decoding via hwaccel infrastructure
vdpau: Add H.264 decoding via hwaccel infrastructure
Conflicts:
configure
libavcodec/Makefile
libavcodec/version.h
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeglsdec.c')
0 files changed, 0 insertions, 0 deletions