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)
* commit '090cd0631140ac1a3a795d2adfac5dbf5e381aa2':
  vc1: check the source buffer in vc1_mc functions

Conflicts:
libavcodec/vc1dec.c

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

Simple merge