diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 16:32:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 17:01:01 +0200 |
| commit | 0e097616865ea8a1fa8e63a451a4921336660283 (patch) | |
| tree | 05e40d896f65d266c68a84d2c780acefba791c45 /libavcodec/ffv1.h | |
| parent | aa760b1735907d256758ee67daa64f1e3b09bf0c (diff) | |
| parent | a7d2861d36756b913e85681b86ed3385274e8ced (diff) | |
| download | ffmpeg-streaming-0e097616865ea8a1fa8e63a451a4921336660283.zip ffmpeg-streaming-0e097616865ea8a1fa8e63a451a4921336660283.tar.gz | |
Merge commit 'a7d2861d36756b913e85681b86ed3385274e8ced'
* commit 'a7d2861d36756b913e85681b86ed3385274e8ced':
svq3: K&R formatting cosmetics
fate: Introduce ENCMUX macro for tests that require encoders and a muxer
ffv1: Add missing #includes to header file
Conflicts:
libavcodec/ffv1.h
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1.h')
| -rw-r--r-- | libavcodec/ffv1.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index e0e33f8..02c3afa 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -35,11 +35,12 @@ #include "libavutil/pixdesc.h" #include "libavutil/timer.h" #include "avcodec.h" -#include "internal.h" #include "dsputil.h" -#include "rangecoder.h" -#include "golomb.h" +#include "get_bits.h" +#include "internal.h" #include "mathops.h" +#include "put_bits.h" +#include "rangecoder.h" #ifdef __INTEL_COMPILER #undef av_flatten |
