diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:36:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:36:37 +0100 |
| commit | 2f265d9087362c17920e4bce59b21653f3fffbfe (patch) | |
| tree | 209ef39243b60e4f360646fd211d88e15f913418 /libavcodec/h264.h | |
| parent | 86b4dc6277691781015000763563d1baf212cdc7 (diff) | |
| parent | 6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13 (diff) | |
| download | ffmpeg-2f265d9087362c17920e4bce59b21653f3fffbfe.tar.gz | |
Merge commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13'
* commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13':
mpegvideo: treat delayed pictures as used
Conflicts:
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index eb88c0c21d..bea6e22eca 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -98,12 +98,6 @@ #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 + 6*6) // The maximum supported qp /* NAL unit types */ |