OSDN Git Service

Merge commit 'd909f43b5c773a73c8d526638744547ba4aa8c59'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 18:32:26 +0000 (19:32 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 18:32:26 +0000 (19:32 +0100)
commit61400a1dc751c82cf6f33a7510c3804b7b201f25
treed1d1e0f627418472e93ede72627e07a356ac62cf
parentf64b53f2bf5f3f43402564bf57a8555a709d012c
parentd909f43b5c773a73c8d526638744547ba4aa8c59
Merge commit 'd909f43b5c773a73c8d526638744547ba4aa8c59'

* commit 'd909f43b5c773a73c8d526638744547ba4aa8c59':
  vc1dec: wmv2dec: Validate ff_intrax8_common_init return value

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/vc1dec.c
libavcodec/wmv2dec.c