diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 05:59:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 06:05:19 +0100 |
| commit | a81a2b514eec4614fca277c0cbd8f5a1dbe2946e (patch) | |
| tree | 4b0f175b2b90be9e667297f9eba01395fe80530b /libavcodec/h264.h | |
| parent | 6102dda1d754925e384e7e195441b1e6cd6d9a9c (diff) | |
| parent | 5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27 (diff) | |
| download | ffmpeg-a81a2b514eec4614fca277c0cbd8f5a1dbe2946e.tar.gz | |
Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'
* commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27':
h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define
Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 613c356228..7b2cf5ff93 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -39,6 +39,8 @@ #include "h264qpel.h" #include "rectangle.h" +#define H264_MAX_PICTURE_COUNT 36 + #define MAX_SPS_COUNT 32 #define MAX_PPS_COUNT 256 |