diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 16:57:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 16:57:49 +0100 |
| commit | 68ed0b6cd111312fa44c4e979a4813bb349d3870 (patch) | |
| tree | 31052f8cc15a0b0685d448ca69d1610a6f4d08a0 | |
| parent | f1edf881ef83de9f8af12fae32cb28f895ae988a (diff) | |
| parent | ee3fc8aa864f6d95356a7d9d03536e2b12b891c5 (diff) | |
| download | ffmpeg-68ed0b6cd111312fa44c4e979a4813bb349d3870.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix libxvid crash on failing initialisation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/libxvid.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 40b3bffacf..97ab2d4a07 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -48,6 +48,7 @@ * This stores all the private context for the codec. */ struct xvid_context { + AVClass *class; void *encoder_handle; /**< Handle for Xvid encoder */ int xsize; /**< Frame x size */ int ysize; /**< Frame y size */ |