diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 11:56:57 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 11:56:57 +0200 |
| commit | fc0eafb7f8b289aa6dcef0c26b3f615f551925ab (patch) | |
| tree | 0854681524186150a26fa7ec770cde60247a7246 /libavcodec | |
| parent | bef74ef367057b26fa3e5bb37db6dbdb8bfce159 (diff) | |
| parent | 2e4a7bd553ec7c805b4a3b90733405a14ba69072 (diff) | |
| download | ffmpeg-fc0eafb7f8b289aa6dcef0c26b3f615f551925ab.tar.gz | |
Merge commit '2e4a7bd553ec7c805b4a3b90733405a14ba69072'
* commit '2e4a7bd553ec7c805b4a3b90733405a14ba69072':
h264: drop unused H264Context.gb
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index efe3555132..f91e5be518 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -31,9 +31,9 @@ #include "libavutil/buffer.h" #include "libavutil/intreadwrite.h" #include "libavutil/thread.h" + #include "cabac.h" #include "error_resilience.h" -#include "get_bits.h" #include "h264_parse.h" #include "h264_sei.h" #include "h2645_parse.h" @@ -460,7 +460,6 @@ typedef struct H264Context { H264DSPContext h264dsp; H264ChromaContext h264chroma; H264QpelContext h264qpel; - GetBitContext gb; H264Picture DPB[H264_MAX_PICTURE_COUNT]; H264Picture *cur_pic_ptr; |