]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '23d6ba2c44540eb39c6880e4cbd527d297d264a9'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Sep 2013 12:34:18 +0000 (14:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Sep 2013 12:34:36 +0000 (14:34 +0200)
* commit '23d6ba2c44540eb39c6880e4cbd527d297d264a9':
  vc1dec: Check the error handling flags on slice/field header decode errors

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

Simple merge