diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 14:11:00 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 14:18:23 +0400 |
| commit | b1064dd783b25b80ec0790876877bc886c2ec449 (patch) | |
| tree | 23481a59a22165e21b6926bc6d096b0a47b1cd50 /libswscale/x86/swscale.c | |
| parent | 7609d42d0f4682ccccbebe0c70613af189134a33 (diff) | |
| parent | 1db6a080bddd14fed6b29140ecd2e21e42b1c022 (diff) | |
Merge commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022'
* commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022':
dca: Move ff_dca_convert_bitstream() to the DCA common code
vdpau: wrap codec specific functions in appropiate #ifs
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86/swscale.c')
0 files changed, 0 insertions, 0 deletions