Merge commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Dec 2012 14:36:37 +0000 (15:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Dec 2012 14:36:37 +0000 (15:36 +0100)
commit2f265d9087362c17920e4bce59b21653f3fffbfe
tree209ef39243b60e4f360646fd211d88e15f913418
parent86b4dc6277691781015000763563d1baf212cdc7
parent6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13
Merge commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13'

* commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13':
  mpegvideo: treat delayed pictures as used

Conflicts:
libavcodec/h264.h

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