[FFmpeg-cvslog] Merge commit 'b1bb8fb860b47e90dd67f0c5740698128fc82dcc'

Michael Niedermayer git at videolan.org
Wed Apr 17 15:42:08 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 17 15:35:41 2013 +0200| [251f283b9d1bbec2fa5031c733d95d319283d6c5] | committer: Michael Niedermayer

Merge commit 'b1bb8fb860b47e90dd67f0c5740698128fc82dcc'

* commit 'b1bb8fb860b47e90dd67f0c5740698128fc82dcc':
  svq1dec: check that the reference frame has the same dimensions as the current one

Conflicts:
	libavcodec/svq1dec.c

See: 3b57bb478ff4455773378355e285877d757e151e

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=251f283b9d1bbec2fa5031c733d95d319283d6c5
---





More information about the ffmpeg-cvslog mailing list