diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 21:36:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 21:36:46 +0200 |
| commit | 29119aff6cc7ebe6d3f46cc11cf91aaa4f37904b (patch) | |
| tree | bb18645d9cb88a670f3fb980cdcf4478142cf564 /libavdevice/v4l2-common.h | |
| parent | 2dbda9378c1e60d9f8b11ca0d1b3113a01e39742 (diff) | |
| parent | 746ad4e0df7faf93329804e412ec53c1d929a75b (diff) | |
| download | ffmpeg-29119aff6cc7ebe6d3f46cc11cf91aaa4f37904b.tar.gz | |
Merge commit '746ad4e0df7faf93329804e412ec53c1d929a75b'
* commit '746ad4e0df7faf93329804e412ec53c1d929a75b':
dct-test: Improve CPU flags struct member name
Conflicts:
libavcodec/dct-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/v4l2-common.h')
0 files changed, 0 insertions, 0 deletions