diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 17:16:20 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-01-27 09:07:59 +0100 |
| commit | cf1e0786ed64e69614760bfb4ecd7adbde8e6094 (patch) | |
| tree | 3f9950cdc5d877b7d21ed8de8508b75e294d7bf3 /libavcodec/error_resilience.h | |
| parent | a7e0380497306d9723dec8440a4c52e8bf0263cf (diff) | |
| download | ffmpeg-cf1e0786ed64e69614760bfb4ecd7adbde8e6094.tar.gz | |
error_resilience: move the MECmpContext initialization into ER code
Currently, it needs to be initialized by the ER caller (which is
currently either a mpegvideo decoder or h264dec). However, since none of
those decoders use MECmpContext for anything except ER, it makes more
sense to handle it purely inside ER.
Diffstat (limited to 'libavcodec/error_resilience.h')
| -rw-r--r-- | libavcodec/error_resilience.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h index 7b9ec1918e..611b529311 100644 --- a/libavcodec/error_resilience.h +++ b/libavcodec/error_resilience.h @@ -52,7 +52,8 @@ typedef struct ERPicture { typedef struct ERContext { AVCodecContext *avctx; - MECmpContext *mecc; + MECmpContext mecc; + int mecc_inited; int *mb_index2xy; int mb_num; |