diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 14:17:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 14:17:40 +0200 |
| commit | 067d11bf71e87d6bcc6a12eb302d6281a0d2408d (patch) | |
| tree | 30b1c837669dcc718e3366cf04c9edaa61e8e969 /libavcodec/a64multienc.c | |
| parent | ec6a855b3a6b87f3415cc4ecfc685bd2eefc6a80 (diff) | |
| parent | 502cde409ca5ee97ef70c2cdede88b9101746ff6 (diff) | |
| download | ffmpeg-067d11bf71e87d6bcc6a12eb302d6281a0d2408d.tar.gz | |
Merge commit '502cde409ca5ee97ef70c2cdede88b9101746ff6'
* commit '502cde409ca5ee97ef70c2cdede88b9101746ff6':
vdpau: force reinitialization when output resolution changes
Conflicts:
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/a64multienc.c')
0 files changed, 0 insertions, 0 deletions