Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Mar 2015 11:19:46 +0000 (13:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Mar 2015 11:19:50 +0000 (13:19 +0200)
commit81487781e739a20deeeb5d3d232c5737e794e80f
tree7f4d30aeb5952a74c7994cd59455e52794553680
parent93704e09c77e991e18c8bc1f0ab7f1e03062150e
parentb3673f34149106eedc0457e2a2d4a9ef75a884d5
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavc/h264_refs: Fix compilation with -DTRACE.
  Fix make checkheaders if libmfx is not available.
  lavf/gif: Add an option max_gif_delay to limit the frame duration.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile