Merge commit '7d36474d1908d6267d4e11d4d9909f9604bd0c81'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
pull/164/head
Hendrik Leppkes 9 years ago
commit c9dbff60c6
  1. 2
      libavcodec/imgconvert.c

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

Loading…
Cancel
Save