diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 15:45:21 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 15:45:21 +0400 |
| commit | 4ee0984341d89c657ebdd835483bbe3ea48e9c19 (patch) | |
| tree | 7df0914957f1708ac23cd0b6cc8f4f8a8b1bbf24 /ffmpeg_opt.c | |
| parent | bf36dc50ea448999c8f8c7a35f6139a7040f6275 (diff) | |
| parent | a0ad5d011318f951ecd4c9ffe1829518c9533909 (diff) | |
Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'
* commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909':
vdpau: deprecate old codec-specific pixel formats
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions