Merge commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13'

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

Conflicts:
	libavcodec/h264.h

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

diff --cc libavcodec/h264.h
index eb88c0c21de7bab2dab7fe062937947d77992d45,3c99030ed2c7378bd35d4fad6a3fbee2f2f897f9..bea6e22ecac675aa9cb1b37fba986aac026a1ac7
--- 1/libavcodec/h264.h
--- 2/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@@ -98,13 -95,7 +98,7 @@@
  #define IS_REF0(a)         ((a) & MB_TYPE_REF0)
  #define IS_8x8DCT(a)       ((a) & MB_TYPE_8x8DCT)
  
- /**
-  * Value of Picture.reference when Picture is not a reference picture, but
-  * is held for delayed output.
-  */
- #define DELAYED_PIC_REF 4
- 
 -#define QP_MAX_NUM (51 + 2 * 6)           // The maximum supported qp
 +#define QP_MAX_NUM (51 + 6*6)           // The maximum supported qp
  
  /* NAL unit types */
  enum {

diff --cc libavcodec/mpegvideo.c
Simple merge

diff --cc libavcodec/mpegvideo.h
Simple merge