diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-15 04:05:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-15 04:05:04 +0100 |
| commit | baaa6d6785bca89683240a362eb8aee1fb97abcb (patch) | |
| tree | a207ebd64e143b57c0387693c8269681e86e79dd /libavdevice/opengl_enc_shaders.h | |
| parent | efe4a06929a885c740a255c42a746758cd60e97f (diff) | |
| parent | ba7dfe5c50b2b618b54ff1e7c3972b07d172f163 (diff) | |
| download | ffmpeg-baaa6d6785bca89683240a362eb8aee1fb97abcb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi doxy: add buffer{src,sink}.h to the main lavfi doxy group
Conflicts:
libavfilter/buffersink.h
libavfilter/buffersrc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/opengl_enc_shaders.h')
0 files changed, 0 insertions, 0 deletions