Michael Niedermayer cf061a9c3b 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@gmx.at>

2013-01-20 13:57:10 +01:00

22 KiB

Raw Blame History

View Raw