[FFmpeg-cvslog] Merge commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a'

Michael Niedermayer git at videolan.org
Sun Jan 20 14:02:01 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 20 13:57:10 2013 +0100| [cf061a9c3b861a048dd5b67ded5265c6f53805e5] | committer: Michael Niedermayer

Merge commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a'

* commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a':
  vp3: integrate clear_blocks with idct of previous block.
  mpegvideo: fix loop condition in draw_line()
  dvdsubdec: parse the size from the extradata

Conflicts:
	libavcodec/dvdsubdec.c
	libavcodec/mpegvideo.c

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

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





More information about the ffmpeg-cvslog mailing list