diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-17 14:24:01 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-17 14:24:09 +0100 |
commit | 59e46ef63ab478b9ad46fc7aefc2937692afc807 (patch) | |
tree | ffe043bf049c86181db65c61561b3eb7aed2ae1d | |
parent | f3147917bf0067356776839152fcf7d85c88b8a9 (diff) | |
parent | 1f8f43a5b5e9b966d364d1d2d6ed741f07dcceaa (diff) | |
download | ffmpeg-59e46ef63ab478b9ad46fc7aefc2937692afc807.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
error_resilience: add required headers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/error_resilience.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h index b2318b79d2..970fdc2066 100644 --- a/libavcodec/error_resilience.h +++ b/libavcodec/error_resilience.h @@ -20,6 +20,11 @@ #ifndef AVCODEC_ERROR_RESILIENCE_H #define AVCODEC_ERROR_RESILIENCE_H +#include <stdint.h> + +#include "avcodec.h" +#include "dsputil.h" + ///< current MB is the first after a resync marker #define VP_START 1 #define ER_AC_ERROR 2 |