diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-08 10:03:51 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-08 10:03:51 +0100 |
| commit | c9dbff60c69d5962b4bac47cc0b11e8656d15166 (patch) | |
| tree | 1d88791f0fd04541209b67c4bcf9e22c3e6cbf6e /libavcodec | |
| parent | 68cb0dc8a3e8acec047ed078cd2c021d4dd94024 (diff) | |
| parent | 7d36474d1908d6267d4e11d4d9909f9604bd0c81 (diff) | |
| download | ffmpeg-c9dbff60c69d5962b4bac47cc0b11e8656d15166.tar.gz | |
Merge commit '7d36474d1908d6267d4e11d4d9909f9604bd0c81'
* commit '7d36474d1908d6267d4e11d4d9909f9604bd0c81':
imgconvert: Re-enable the deprecation warnings
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/imgconvert.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 9471a8ae7f..7d5dff6a83 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -351,5 +351,5 @@ int main(void){ } #endif -FF_DISABLE_DEPRECATION_WARNINGS +FF_ENABLE_DEPRECATION_WARNINGS #endif /* FF_API_AVPICTURE */ |