RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 00:32:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658'

Browse Source 
* commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658':
  h264 does not depend on mpegvideo any more

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-17 13:46:09 +01:00
commit ad9a6e19e1
7 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/h264.c
View File

@ -38,7 +38,6 @@
#include "dsputil.h"
#include "error_resilience.h"
#include "avcodec.h"
#include "mpegvideo.h"
#include "h264.h"
#include "h264data.h"
#include "h264chroma.h"

3
libavcodec/h264.h
View File

@ -33,13 +33,14 @@
#include "dsputil.h"
#include "error_resilience.h"
#include "get_bits.h"
#include "mpegvideo.h"
#include "h264chroma.h"
#include "h264dsp.h"
#include "h264pred.h"
#include "h264qpel.h"
#include "mpegutils.h"
#include "parser.h"
#include "rectangle.h"
#include "videodsp.h"
#define H264_MAX_PICTURE_COUNT 36
#define H264_MAX_THREADS 32

1
libavcodec/h264_cavlc.c
View File

@ -30,7 +30,6 @@
#include "internal.h"
#include "avcodec.h"
#include "mpegvideo.h"
#include "h264.h"
#include "h264data.h" // FIXME FIXME FIXME
#include "h264_mvpred.h"

1
libavcodec/h264_direct.c
View File

@ -27,7 +27,6 @@
#include "internal.h"
#include "avcodec.h"
#include "mpegvideo.h"
#include "h264.h"
#include "mpegutils.h"
#include "rectangle.h"

1
libavcodec/h264_loopfilter.c
View File

@ -29,7 +29,6 @@
#include "libavutil/intreadwrite.h"
#include "internal.h"
#include "avcodec.h"
#include "mpegvideo.h"
#include "h264.h"
#include "mathops.h"
#include "mpegutils.h"

1
libavcodec/h264data.h
View File

@ -32,7 +32,6 @@
#include <stdint.h>
#include "libavutil/rational.h"
#include "mpegvideo.h"
#include "h264.h"
static const uint8_t golomb_to_pict_type[5] = {

1
libavcodec/svq3.c
View File

@ -44,7 +44,6 @@
#include "internal.h"
#include "avcodec.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "h264.h"
#include "h264data.h" // FIXME FIXME FIXME