[FFmpeg-cvslog] Merge commit '85b8403c6fd11e1c570caa970c7f435ac5f9583e'

[Clément Bœsch]

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

Merge commit '85b8403c6fd11e1c570caa970c7f435ac5f9583e'

* commit '85b8403c6fd11e1c570caa970c7f435ac5f9583e':
  svq1enc: 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=c7253353f8f1ce18ceaca00f0482e35b7fa34069
---

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

diff --git a/libavcodec/svq1enc.h b/libavcodec/svq1enc.h
index 37f05a0..b4ef763 100644
--- a/libavcodec/svq1enc.h
+++ b/libavcodec/svq1enc.h
@@ -24,8 +24,8 @@
 #include <stdint.h>
 
 #include "libavutil/frame.h"
+
 #include "avcodec.h"
-#include "get_bits.h"
 #include "hpeldsp.h"
 #include "me_cmp.h"
 #include "mpegvideo.h"
@@ -42,7 +42,6 @@ typedef struct SVQ1EncContext {
     AVFrame *current_picture;
     AVFrame *last_picture;
     PutBitContext pb;
-    GetBitContext gb;
 
     /* Some compression statistics */
     enum AVPictureType pict_type;


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