1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit '7d36474d1908d6267d4e11d4d9909f9604bd0c81'

* commit '7d36474d1908d6267d4e11d4d9909f9604bd0c81':
  imgconvert: Re-enable the deprecation warnings

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-12-08 10:03:51 +01:00
commit c9dbff60c6

View File

@ -351,5 +351,5 @@ int main(void){
} }
#endif #endif
FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_AVPICTURE */ #endif /* FF_API_AVPICTURE */