diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 14:45:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 14:55:08 +0100 |
| commit | 68ebf70f665bee7a55e99013eec51963429b8f4e (patch) | |
| tree | 967a7285e8e46ebf127a8820cb1a93eb84380325 /libavcodec/cavsdsp.h | |
| parent | c8b99f8ad0589bf1bf5f107f44eb4b207bf6c431 (diff) | |
| parent | ff23c4e4935e96e62d8ff2212a1955a43add88e1 (diff) | |
| download | ffmpeg-68ebf70f665bee7a55e99013eec51963429b8f4e.tar.gz | |
Merge commit 'ff23c4e4935e96e62d8ff2212a1955a43add88e1'
* commit 'ff23c4e4935e96e62d8ff2212a1955a43add88e1':
doxy: Add AVFrame to the structured modules
Conflicts:
libavutil/frame.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavsdsp.h')
0 files changed, 0 insertions, 0 deletions