diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 13:29:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 13:30:24 +0200 |
| commit | 33bf66af02fe07ad810bea792782388c34be5e66 (patch) | |
| tree | 62bee5972ad5dae646149588cb373dd2914b15f3 /libavformat/mpegts.h | |
| parent | 34e80af860d6254250878d311a1aba183d0a5382 (diff) | |
| parent | bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc (diff) | |
| download | ffmpeg-33bf66af02fe07ad810bea792782388c34be5e66.tar.gz | |
Merge commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc'
* commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc':
x11grab: Fallback to normal XImage if SHM is not supported
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.h')
0 files changed, 0 insertions, 0 deletions