Merge commit 'b7f98659f21dce438c33b512e25fd64b8d07c347'

* commit 'b7f98659f21dce438c33b512e25fd64b8d07c347':
  Remove unnecessary get_bits.h #includes

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

diff --cc libavcodec/ac3.c
Simple merge

diff --cc libavcodec/dv.c
Simple merge

diff --cc libavcodec/dv.h
Simple merge

diff --cc libavcodec/dvbsub_parser.c
index af467f7,ba83a70..ccb63c3
--- 1/libavcodec/dvbsub_parser.c
--- 2/libavcodec/dvbsub_parser.c
+++ b/libavcodec/dvbsub_parser.c
@@@ -15,11 -15,16 +15,16 @@@
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
+ 
+ #include <inttypes.h>
+ #include <string.h>
+ 
+ #include "libavutil/intreadwrite.h"
+ 
  #include "avcodec.h"
- #include "get_bits.h"
  #include "internal.h"
  
  /* Parser (mostly) copied from dvdsub.c */

diff --cc libavcodec/dvenc.c
Simple merge

diff --cc libavcodec/flacenc.c
index a91ed19,67f899f..9d6a742
--- 1/libavcodec/flacenc.c
--- 2/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@@ -24,9 -23,9 +24,10 @@@
  #include "libavutil/intmath.h"
  #include "libavutil/md5.h"
  #include "libavutil/opt.h"
+ 
  #include "avcodec.h"
  #include "bswapdsp.h"
 +#include "put_bits.h"
  #include "golomb.h"
  #include "internal.h"
  #include "lpc.h"

diff --cc libavcodec/hq_hqa.c
Simple merge

diff --cc libavcodec/hq_hqa.h
Simple merge

diff --cc libavcodec/mpc.c
Simple merge

diff --cc libavcodec/mpeg12vlc.h
Simple merge

diff --cc libavcodec/msmpeg4data.h
Simple merge

diff --cc libavcodec/vc1data.h
Simple merge

diff --cc libavcodec/vp5.c
Simple merge

diff --cc libavcodec/xxan.c
Simple merge

diff --cc libavformat/dvenc.c
index 422823c,cf79534..93c103b
--- 1/libavformat/dvenc.c
--- 2/libavformat/dvenc.c
+++ b/libavformat/dvenc.c
@@@ -35,11 -35,8 +35,12 @@@
  #include "libavcodec/dv_profile.h"
  #include "libavcodec/dv.h"
  #include "dv.h"
++#include "libavutil/avassert.h"
  #include "libavutil/fifo.h"
  #include "libavutil/mathematics.h"
 +#include "libavutil/intreadwrite.h"
 +#include "libavutil/opt.h"
 +#include "libavutil/timecode.h"
  
  #define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32-bit audio
  

diff --cc libavformat/rtpdec.c
Simple merge