[FFmpeg-cvslog] Merge commit '859ce02c9815b492da627d3098548b4f69bbc80e' into release/2.4

Michael Niedermayer git at videolan.org
Thu Aug 20 14:29:33 CEST 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michael at niedermayer.cc> | Thu Aug 20 14:13:02 2015 +0200| [e0f859e8fe141c7bb23a99c70229199508b964c2] | committer: Michael Niedermayer

Merge commit '859ce02c9815b492da627d3098548b4f69bbc80e' into release/2.4

* commit '859ce02c9815b492da627d3098548b4f69bbc80e':
  h263: Always check both dimensions

Conflicts:
	libavcodec/ituh263dec.c

See: 62006b539ddda23594febf0fcb2f21c03de60457
Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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





More information about the ffmpeg-cvslog mailing list