virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51'

Browse Source 
* commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51':
  configure: Add missing h264chroma dependencies to vp5, vp6
  Add missing error_resilience includes to files that use ER

Conflicts:
	configure
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-08 15:23:56 +01:00
commit c32cc7e3a4
11 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -1797,8 +1797,8 @@ vc1image_decoder_select="vc1_decoder"
vorbis_decoder_select="mdct"
vorbis_encoder_select="mdct"
vp3_decoder_select="vp3dsp videodsp"
vp5_decoder_select="h264chroma vp3dsp videodsp"
vp6_decoder_select="h264chroma huffman vp3dsp videodsp"
vp5_decoder_select="h264chroma videodsp vp3dsp"
vp6_decoder_select="h264chroma huffman videodsp vp3dsp"
vp6a_decoder_select="vp6_decoder"
vp6f_decoder_select="vp6_decoder"
vp8_decoder_select="h264pred videodsp"

1
libavcodec/h263dec.c
View File

@ -30,6 +30,7 @@
#include "libavutil/cpu.h"
#include "internal.h"
#include "avcodec.h"
#include "error_resilience.h"
#include "mpegvideo.h"
#include "h263.h"
#include "h263_parser.h"

1
libavcodec/h264.c
View File

@ -33,6 +33,7 @@
#include "cabac.h"
#include "cabac_functions.h"
#include "dsputil.h"
#include "error_resilience.h"
#include "avcodec.h"
#include "mpegvideo.h"
#include "h264.h"

1
libavcodec/h264.h
View File

@ -30,6 +30,7 @@
#include "libavutil/intreadwrite.h"
#include "cabac.h"
#include "error_resilience.h"
#include "get_bits.h"
#include "mpegvideo.h"
#include "h264chroma.h"

1
libavcodec/intrax8.c
View File

@ -23,6 +23,7 @@
#include "libavutil/avassert.h"
#include "avcodec.h"
#include "error_resilience.h"
#include "get_bits.h"
#include "mpegvideo.h"
#include "msmpeg4data.h"

7
libavcodec/mpeg12.c
View File

@ -28,13 +28,14 @@
#define UNCHECKED_BITSTREAM_READER 1
//#define DEBUG
#include "libavutil/avassert.h"
#include "libavutil/timecode.h"
#include "internal.h"
#include "avcodec.h"
#include "dsputil.h"
#include "mpegvideo.h"
#include "libavutil/avassert.h"
#include "libavutil/timecode.h"
#include "error_resilience.h"
#include "mpeg12.h"
#include "mpeg12data.h"
#include "mpeg12decdata.h"

1
libavcodec/mpeg4videodec.c
View File

@ -23,6 +23,7 @@
#define UNCHECKED_BITSTREAM_READER 1
#include "libavutil/opt.h"
#include "error_resilience.h"
#include "mpegvideo.h"
#include "mpeg4video.h"
#include "h263.h"

1
libavcodec/mss2.c
View File

@ -24,6 +24,7 @@
*/
#include "libavutil/avassert.h"
#include "error_resilience.h"
#include "internal.h"
#include "msmpeg4data.h"
#include "vc1.h"

1
libavcodec/rv10.c
View File

@ -27,6 +27,7 @@
#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "error_resilience.h"
#include "mpegvideo.h"
#include "mpeg4video.h"
#include "h263.h"

1
libavcodec/rv34.c
View File

@ -28,6 +28,7 @@
#include "libavutil/internal.h"
#include "avcodec.h"
#include "error_resilience.h"
#include "mpegvideo.h"
#include "golomb.h"
#include "internal.h"

1
libavcodec/vc1dec.c
View File

@ -28,6 +28,7 @@
#include "internal.h"
#include "avcodec.h"
#include "error_resilience.h"
#include "mpegvideo.h"
#include "h263.h"
#include "h264chroma.h"