diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-14 13:03:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-14 13:09:30 +0100 |
| commit | 688c3d944de3828e9cf577f809a9a4b78237247c (patch) | |
| tree | 5ab214076277df3c7daf11cc3448e3432448c985 /ffmpeg_vdpau.c | |
| parent | f5013913da3691121df74c7d57a517c1ca279c53 (diff) | |
| parent | c85aad9cb2af459e8306871f76722de440c3ca93 (diff) | |
| download | ffmpeg-688c3d944de3828e9cf577f809a9a4b78237247c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doxy: Define a group for libswscale documentation
Conflicts:
libavutil/avutil.h
libswscale/swscale.h
See: 18d9398143ac63915e85d76447dca5c9670ed58a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_vdpau.c')
0 files changed, 0 insertions, 0 deletions