diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 22:58:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 23:06:32 +0200 |
| commit | 14617e3a739ea23e8da9adcdca4418f2b14a3956 (patch) | |
| tree | dac93fcbac626cf67282e92da13078f806c10fe7 /libavcodec/mpc7.c | |
| parent | 7fc6545d5d7301196d1c23a45a24a9707bac0060 (diff) | |
| parent | 172b2cee17a3779c114ba065dd7b25dcf61e408f (diff) | |
| download | ffmpeg-14617e3a739ea23e8da9adcdca4418f2b14a3956.tar.gz | |
Merge commit '172b2cee17a3779c114ba065dd7b25dcf61e408f'
* commit '172b2cee17a3779c114ba065dd7b25dcf61e408f':
dxva2: Add ifdefs around structs that might not be available
Conflicts:
libavcodec/dxva2.c
See: 94d07b314aa516284cc21ea720d4a305f881b6c2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpc7.c')
0 files changed, 0 insertions, 0 deletions