diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 13:21:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 13:21:52 +0200 |
| commit | 0ba887bbf4d99b609247a5447dc63dc2e7550ff5 (patch) | |
| tree | ceeab3191d427df6dfdca35962ec23d6e00d57de /libavcodec/movtextdec.c | |
| parent | 8df41976b7cd2e3ae0fd83ec585c886e94734acf (diff) | |
| parent | 89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4 (diff) | |
| download | ffmpeg-0ba887bbf4d99b609247a5447dc63dc2e7550ff5.tar.gz | |
Merge commit '89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4'
* commit '89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4':
vdpau: pass codec-specific parameters from hwaccel
Conflicts:
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/movtextdec.c')
0 files changed, 0 insertions, 0 deletions