Merge commit '7d36474d'

* commit '7d36474d':
  imgconvert: Re-enable the deprecation warnings
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

libavcodec/imgconvert.c

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