diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-29 20:54:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-29 20:54:25 +0100 |
| commit | 64e7cf12532ecca43535db7a10303b99538a41dc (patch) | |
| tree | 44e8d30cd71c64e9b1fc7de042b87fa4b5b2f57a /libavdevice/dshow_enumpins.c | |
| parent | e5b7e2224f62e9cb6697e664b7d1245302cca9e7 (diff) | |
| parent | 598f7d046cbf306706623210c5baafa3b7cd1df3 (diff) | |
| download | ffmpeg-64e7cf12532ecca43535db7a10303b99538a41dc.tar.gz | |
Merge commit '598f7d046cbf306706623210c5baafa3b7cd1df3'
* commit '598f7d046cbf306706623210c5baafa3b7cd1df3':
DNxHD: Simplify pixel format detection
Conflicts:
libavcodec/dnxhddec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/dshow_enumpins.c')
0 files changed, 0 insertions, 0 deletions