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)
* 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>
1  2 
libavcodec/Makefile

Simple merge