diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-29 15:32:39 +0100 |
---|---|---|
committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-01-27 23:45:44 +0100 |
commit | 2cd41c5d52307b4fff7d2626dca16663f269b2be (patch) | |
tree | 91a1e4a15511a13129d762f300bf419cc7c6abf6 /libavdevice/x11grab.c | |
parent | 1272b88d04574f20aa56e6bbefcdf1405f267401 (diff) | |
download | ffmpeg-2cd41c5d52307b4fff7d2626dca16663f269b2be.tar.gz |
Merge commit '8375dc1dd101d51baa430f34c0bcadfa37873896'
* commit '8375dc1dd101d51baa430f34c0bcadfa37873896':
asfdec: handle the case when the stream index has an invalid value better
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
(cherry picked from commit bf67ae3cfa28ea3c126a6d23f44d9fbb5222b54b)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavdevice/x11grab.c')
0 files changed, 0 insertions, 0 deletions