]> git.sesse.net Git - ffmpeg/commit
Merge commit '75af13a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 03:34:21 +0000 (04:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 03:35:48 +0000 (04:35 +0100)
commit3ddf9b5b7750bda97a591272fa0860e53b4f5c4f
treec9175f613329f9612cd956efa3a99dad57f2163d
parentb73aae6fe9b78905635f138c931da621f83aaa31
parent75af13a0e4c54ee780249e16c8e14983614e2f25
Merge commit '75af13a'

* commit '75af13a':
  mpegvideo: directly use frames in ff_draw_horiz_band()

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/svq3.c