diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 11:46:36 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 11:46:36 +0200 |
| commit | 0501305e38adbcbec73c64505d14a1c7fdeb83b1 (patch) | |
| tree | 782c1ca4a45085ea59b7fb0a322fa100b195d354 /libavcodec | |
| parent | c7253353f8f1ce18ceaca00f0482e35b7fa34069 (diff) | |
| parent | 42dc214323637464759354912e18b2bee1884dd1 (diff) | |
| download | ffmpeg-0501305e38adbcbec73c64505d14a1c7fdeb83b1.tar.gz | |
Merge commit '42dc214323637464759354912e18b2bee1884dd1'
* commit '42dc214323637464759354912e18b2bee1884dd1':
mpc: Drop unused GetBitContext context member
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/mpc.h b/libavcodec/mpc.h index 4cb8574897..df462af6b7 100644 --- a/libavcodec/mpc.h +++ b/libavcodec/mpc.h @@ -30,9 +30,9 @@ #define AVCODEC_MPC_H #include "libavutil/lfg.h" + #include "avcodec.h" #include "bswapdsp.h" -#include "get_bits.h" #include "mpegaudio.h" #include "mpegaudiodsp.h" @@ -52,7 +52,6 @@ typedef struct Band { typedef struct MPCContext { BswapDSPContext bdsp; MPADSPContext mpadsp; - GetBitContext gb; int IS, MSS, gapless; int lastframelen; int maxbands, last_max_band; |