Merge commit 'b7f98659f21dce438c33b512e25fd64b8d07c347'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:14:57 +0000 (11:14 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:16:01 +0000 (11:16 +0200)
* commit 'b7f98659f21dce438c33b512e25fd64b8d07c347':
  Remove unnecessary get_bits.h #includes

Merged-by: Clément Bœsch <clement@stupeflix.com>
16 files changed:
1  2 
libavcodec/ac3.c
libavcodec/dv.c
libavcodec/dv.h
libavcodec/dvbsub_parser.c
libavcodec/dvenc.c
libavcodec/flacenc.c
libavcodec/hq_hqa.c
libavcodec/hq_hqa.h
libavcodec/mpc.c
libavcodec/mpeg12vlc.h
libavcodec/msmpeg4data.h
libavcodec/vc1data.h
libavcodec/vp5.c
libavcodec/xxan.c
libavformat/dvenc.c
libavformat/rtpdec.c

Simple merge
diff --cc libavcodec/dv.c
Simple merge
diff --cc libavcodec/dv.h
Simple merge
   * 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 */
Simple merge
  #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"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  #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
  
Simple merge