[FFmpeg-cvslog] Merge commit '42dc214323637464759354912e18b2bee1884dd1'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Wed Jun 29 11:46:36 2016 +0200| [0501305e38adbcbec73c64505d14a1c7fdeb83b1] | committer: Clément Bœsch

Merge commit '42dc214323637464759354912e18b2bee1884dd1'

* commit '42dc214323637464759354912e18b2bee1884dd1':
  mpc: Drop unused GetBitContext context member

Merged-by: Clément Bœsch <clement at stupeflix.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0501305e38adbcbec73c64505d14a1c7fdeb83b1
---

 libavcodec/mpc.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/mpc.h b/libavcodec/mpc.h
index 4cb85748..df462af 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;


======================================================================