Merge commit 'ed6dad3737bf7bb2d5e9fa9511dfdb44806010e8'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Oct 2014 02:22:28 +0000 (03:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Oct 2014 02:22:52 +0000 (03:22 +0100)
* commit 'ed6dad3737bf7bb2d5e9fa9511dfdb44806010e8':
  lavf: Implement ff_brktimegm using gmtime_r

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/cutils.c

   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
+ #include "libavutil/time_internal.h"
  #include "avformat.h"
  #include "internal.h"