Merge commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:27:20 +0000 (11:27 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:27:20 +0000 (11:27 +0200)
* commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b':
  mpegvideo: Drop mpegvideo.h where not needed

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/cavsdec.c
libavcodec/dxva2.c
libavcodec/dxva2_internal.h
libavcodec/dxva2_mpeg2.c
libavcodec/libxvid.c
libavcodec/ljpegenc.c
libavcodec/mdec.c
libavcodec/vaapi.c
libavcodec/vaapi_internal.h
libavcodec/vaapi_mpeg2.c
libavcodec/vaapi_mpeg4.c

Simple merge
Simple merge
Simple merge
Simple merge
   * @author Adam Thayer (krevnik@comcast.net)
   */
  
 -#include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
  #include <xvid.h>
  
  #include "libavutil/cpu.h"
 +#include "libavutil/file.h"
+ #include "libavutil/internal.h"
  #include "libavutil/intreadwrite.h"
  #include "libavutil/mathematics.h"
+ #include "libavutil/opt.h"
  
  #include "avcodec.h"
  #include "internal.h"
  #include "libxvid.h"
  #include "mpegutils.h"
- #include "mpegvideo.h"
  
 +#if HAVE_UNISTD_H
 +#include <unistd.h>
 +#endif
 +
 +#if HAVE_IO_H
 +#include <io.h>
 +#endif
 +
  /**
   * Buffer management macros.
   */
Simple merge
@@@ -29,9 -29,7 +29,8 @@@
  
  #include "avcodec.h"
  #include "blockdsp.h"
 +#include "bswapdsp.h"
  #include "idctdsp.h"
- #include "mpegvideo.h"
  #include "mpeg12.h"
  #include "thread.h"
  
@@@ -21,7 -21,8 +21,8 @@@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
 -#include "h264.h"
 +#include "libavutil/log.h"
+ #include "mpegvideo.h"
  #include "vaapi_internal.h"
  
  /**
Simple merge
Simple merge
Simple merge