diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 11:38:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 11:38:42 +0200 |
| commit | e8a460672f7e9aec129a7cfa01345857b1565a15 (patch) | |
| tree | e1ac45a7358c1502eadc93d9389267e41044eb08 /libavcodec/h264.h | |
| parent | 0d5e615c10583af5f346f0bc7420ebc5077a5d47 (diff) | |
| parent | 9d33bab583a82cf12286c65258a29c6888e1ff98 (diff) | |
| download | ffmpeg-streaming-e8a460672f7e9aec129a7cfa01345857b1565a15.zip ffmpeg-streaming-e8a460672f7e9aec129a7cfa01345857b1565a15.tar.gz | |
Merge commit '9d33bab583a82cf12286c65258a29c6888e1ff98'
* commit '9d33bab583a82cf12286c65258a29c6888e1ff98':
h264: drop H264Context.ouputed_poc
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index c595dde..6eb27d7 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -645,7 +645,6 @@ typedef struct H264Context { H264Picture *delayed_pic[MAX_DELAYED_PIC_COUNT + 2]; // FIXME size? int last_pocs[MAX_DELAYED_PIC_COUNT]; H264Picture *next_output_pic; - int outputed_poc; int next_outputed_poc; /** |
