eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-15 03:20:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
cf1f615b67a4a486176b9aeaedeceef0337023e9
ffmpeg/libavcodec/internal.h
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

8.8 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink