aboutsummaryrefslogtreecommitdiffstats
path: root/doc/examples/README
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-10 12:20:23 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-10 12:33:37 +0100
commit81a045fe17d533192a9fb897cb4d71ed44c877e3 (patch)
tree21d098f43ae77e4ac7d5420f1c069e3f9bad59b5 /doc/examples/README
parentd43d5c5707532858b4f6a54525f1768464bcb3c2 (diff)
parent2c3f29c4894ee50635b846f202296ad79a7c0d33 (diff)
downloadffmpeg-81a045fe17d533192a9fb897cb4d71ed44c877e3.tar.gz
Merge commit '2c3f29c4894ee50635b846f202296ad79a7c0d33'
* commit '2c3f29c4894ee50635b846f202296ad79a7c0d33': xcbgrab: Support empty filename string correctly Conflicts: libavdevice/xcbgrab.c See: 62eca2f827d441f52125191fd78c96b67a7ba30c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/README')
0 files changed, 0 insertions, 0 deletions