[FFmpeg-cvslog] Merge commit 'b7f98659f21dce438c33b512e25fd64b8d07c347'

Clément Bœsch git at videolan.org
Wed Jun 29 11:17:58 CEST 2016 

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

Merge commit 'b7f98659f21dce438c33b512e25fd64b8d07c347'

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

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

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

 libavcodec/ac3.c           |    3 ++-
 libavcodec/dv.c            |    1 -
 libavcodec/dv.h            |    2 +-
 libavcodec/dvbsub_parser.c |    7 ++++++-
 libavcodec/dvenc.c         |    2 ++
 libavcodec/flacenc.c       |    1 +
 libavcodec/hq_hqa.c        |    1 +
 libavcodec/hq_hqa.h        |    2 +-
 libavcodec/mpc.c           |    1 -
 libavcodec/mpeg12vlc.h     |    2 +-
 libavcodec/msmpeg4data.h   |    3 ++-
 libavcodec/nellymoser.c    |    7 +++----
 libavcodec/vc1data.h       |    4 +++-
 libavcodec/vp5.c           |    1 -
 libavcodec/xxan.c          |    5 ++---
 libavformat/dvenc.c        |    1 +
 libavformat/rtpdec.c       |    3 ++-
 17 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c
index 1d4eaa5..6d09288 100644
--- a/libavcodec/ac3.c
+++ b/libavcodec/ac3.c
@@ -24,9 +24,10 @@
  * Common code between the AC-3 encoder and decoder.
  */
 
+#include "libavutil/common.h"
+
 #include "avcodec.h"
 #include "ac3.h"
-#include "get_bits.h"
 
 /**
  * Starting frequency coefficient bin for each critical band.
diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 31d1315..9c75cfd 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -44,7 +44,6 @@
 #include "avcodec.h"
 #include "dv.h"
 #include "dvdata.h"
-#include "get_bits.h"
 #include "internal.h"
 #include "put_bits.h"
 #include "simple_idct.h"
diff --git a/libavcodec/dv.h b/libavcodec/dv.h
index af506eb..3367f92 100644
--- a/libavcodec/dv.h
+++ b/libavcodec/dv.h
@@ -29,8 +29,8 @@
 
 #include "avcodec.h"
 #include "dv_profile.h"
-#include "get_bits.h"
 #include "me_cmp.h"
+#include "vlc.h"
 
 typedef struct DVwork_chunk {
     uint16_t buf_offset;
diff --git a/libavcodec/dvbsub_parser.c b/libavcodec/dvbsub_parser.c
index af467f7..ccb63c3 100644
--- a/libavcodec/dvbsub_parser.c
+++ b/libavcodec/dvbsub_parser.c
@@ -18,8 +18,13 @@
  * 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 --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c
index 5de12cc..a27b9ef 100644
--- a/libavcodec/dvenc.c
+++ b/libavcodec/dvenc.c
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include "libavutil/attributes.h"
+#include "libavutil/internal.h"
 #include "libavutil/pixdesc.h"
 
 #include "avcodec.h"
@@ -35,6 +36,7 @@
 #include "dv_tablegen.h"
 #include "fdctdsp.h"
 #include "internal.h"
+#include "mathops.h"
 #include "me_cmp.h"
 #include "pixblockdsp.h"
 #include "put_bits.h"
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index a91ed19..9d6a742 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -24,6 +24,7 @@
 #include "libavutil/intmath.h"
 #include "libavutil/md5.h"
 #include "libavutil/opt.h"
+
 #include "avcodec.h"
 #include "bswapdsp.h"
 #include "put_bits.h"
diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c
index 8825f3d..5cf5fcf 100644
--- a/libavcodec/hq_hqa.c
+++ b/libavcodec/hq_hqa.c
@@ -25,6 +25,7 @@
 
 #include "avcodec.h"
 #include "canopus.h"
+#include "get_bits.h"
 #include "internal.h"
 
 #include "hq_hqa.h"
diff --git a/libavcodec/hq_hqa.h b/libavcodec/hq_hqa.h
index 4286dd0..608e2ca 100644
--- a/libavcodec/hq_hqa.h
+++ b/libavcodec/hq_hqa.h
@@ -24,9 +24,9 @@
 #include <stdint.h>
 
 #include "avcodec.h"
-#include "get_bits.h"
 #include "bytestream.h"
 #include "hq_hqadsp.h"
+#include "vlc.h"
 
 #define NUM_HQ_AC_ENTRIES 746
 #define NUM_HQ_PROFILES   22
diff --git a/libavcodec/mpc.c b/libavcodec/mpc.c
index 7af30bd..6cf9b9d 100644
--- a/libavcodec/mpc.c
+++ b/libavcodec/mpc.c
@@ -28,7 +28,6 @@
 
 #include "libavutil/attributes.h"
 #include "avcodec.h"
-#include "get_bits.h"
 #include "mpegaudiodsp.h"
 #include "mpegaudio.h"
 
diff --git a/libavcodec/mpeg12vlc.h b/libavcodec/mpeg12vlc.h
index ca06e56..c5abae9 100644
--- a/libavcodec/mpeg12vlc.h
+++ b/libavcodec/mpeg12vlc.h
@@ -28,7 +28,7 @@
 #ifndef AVCODEC_MPEG12VLC_H
 #define AVCODEC_MPEG12VLC_H
 
-#include "get_bits.h"
+#include "vlc.h"
 
 #define DC_VLC_BITS 9
 #define MV_VLC_BITS 9
diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h
index 52fecec..02199d0 100644
--- a/libavcodec/msmpeg4data.h
+++ b/libavcodec/msmpeg4data.h
@@ -31,8 +31,9 @@
 #define AVCODEC_MSMPEG4DATA_H
 
 #include "libavutil/common.h"
-#include "get_bits.h"
+
 #include "rl.h"
+#include "vlc.h"
 
 /* motion vector table */
 typedef struct MVTable {
diff --git a/libavcodec/nellymoser.c b/libavcodec/nellymoser.c
index 0740c75..027726e 100644
--- a/libavcodec/nellymoser.c
+++ b/libavcodec/nellymoser.c
@@ -31,11 +31,10 @@
  * implementors. The original code is available from http://code.google.com/p/nelly2pcm/
  */
 
-#include "nellymoser.h"
-#include "avcodec.h"
+#include "libavutil/common.h"
 
-#define BITSTREAM_READER_LE
-#include "get_bits.h"
+#include "avcodec.h"
+#include "nellymoser.h"
 
 const float ff_nelly_dequantization_table[127] = {
  0.0000000000,
diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h
index 763cd48..90dd8ba 100644
--- a/libavcodec/vc1data.h
+++ b/libavcodec/vc1data.h
@@ -29,8 +29,10 @@
 #define AVCODEC_VC1DATA_H
 
 #include <stdint.h>
+
 #include "libavutil/rational.h"
-#include "get_bits.h"
+
+#include "vlc.h"
 
 /** Table for conversion between TTBLK and TTMB */
 extern const int ff_vc1_ttblk_to_tt[3][8];
diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c
index 5bcf9b6..6c664c6 100644
--- a/libavcodec/vp5.c
+++ b/libavcodec/vp5.c
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "get_bits.h"
 #include "internal.h"
 
 #include "vp56.h"
diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c
index 5485296..8bb7087 100644
--- a/libavcodec/xxan.c
+++ b/libavcodec/xxan.c
@@ -20,12 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "avcodec.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
+
+#include "avcodec.h"
 #include "bytestream.h"
-#define BITSTREAM_READER_LE
-#include "get_bits.h"
 #include "internal.h"
 
 typedef struct XanContext {
diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c
index 422823c..93c103b 100644
--- a/libavformat/dvenc.c
+++ b/libavformat/dvenc.c
@@ -35,6 +35,7 @@
 #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"
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index 786be9f..f73cb41 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -21,8 +21,9 @@
 
 #include "libavutil/mathematics.h"
 #include "libavutil/avstring.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/time.h"
-#include "libavcodec/get_bits.h"
+
 #include "avformat.h"
 #include "network.h"
 #include "srtp.h"


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

diff --cc libavcodec/dvbsub_parser.c
index af467f7,ba83a70..ccb63c3
--- a/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/flacenc.c
index a91ed19,67f899f..9d6a742
--- a/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 libavformat/dvenc.c
index 422823c,cf79534..93c103b
--- a/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

More information about the ffmpeg-cvslog mailing list