1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavcodec
Michael Niedermayer 036162a378 Merge commit '5bba3ab0cf7a0238ee1ea31ca2da08ce860fd8f9'
* commit '5bba3ab0cf7a0238ee1ea31ca2da08ce860fd8f9':
  internal: Make dlog/tlog a no-op when disabled

Conflicts:
	libavcodec/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-24 20:49:45 +02:00
..
2015-04-18 14:13:59 -03:00
2015-04-20 04:11:23 +02:00
2015-04-22 17:45:51 +02:00
2015-04-18 14:14:24 -03:00
2015-04-18 14:14:11 -03:00
2015-04-19 23:45:35 +01:00
2015-04-24 00:00:20 -07:00
2015-04-24 00:00:12 -07:00
2015-04-15 09:48:47 +02:00
2015-04-20 14:36:41 +02:00
2015-04-02 16:04:22 +02:00
2015-04-24 16:54:31 +02:00
2015-04-18 18:07:54 -03:00