Merge commit '090cd0631140ac1a3a795d2adfac5dbf5e381aa2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 13:56:01 +0000 (15:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 13:57:35 +0000 (15:57 +0200)
commitf606c6e92c63e914d3e44052fde9005d5bec1249
treee5e7943fa89112eb4bf90bbcc29200118f34d734
parent06fd4e45d9b61fa9d353aea24b8b8aa29e55cb7e
parent090cd0631140ac1a3a795d2adfac5dbf5e381aa2
Merge commit '090cd0631140ac1a3a795d2adfac5dbf5e381aa2'

* commit '090cd0631140ac1a3a795d2adfac5dbf5e381aa2':
  vc1: check the source buffer in vc1_mc functions

Conflicts:
libavcodec/vc1dec.c

See: 3a04c18d899d278eea551c216e5117974063062b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vc1dec.c