• Michael Niedermayer's avatar
    Merge commit '1a3eb042' · 40d552da
    Michael Niedermayer authored
    * commit '1a3eb042':
      Replace av_dlog with normal av_log at trace level
    
    Conflicts:
    	ffplay.c
    	libavdevice/fbdev_dec.c
    	libavfilter/avfilter.c
    	libavfilter/internal.h
    	libavfilter/setpts.c
    	libavfilter/src_movie.c
    	libavfilter/vf_crop.c
    	libavfilter/vf_drawtext.c
    	libavfilter/vf_fieldorder.c
    	libavformat/assdec.c
    	libavformat/avidec.c
    	libavformat/flvdec.c
    	libavformat/http.c
    	libavformat/ipmovie.c
    	libavformat/isom.c
    	libavformat/mov.c
    	libavformat/mpegenc.c
    	libavformat/mpegts.c
    	libavformat/mpegtsenc.c
    	libavformat/mux.c
    	libavformat/mxfdec.c
    	libavformat/nsvdec.c
    	libavformat/oggdec.c
    	libavformat/r3d.c
    	libavformat/rtspdec.c
    	libavformat/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    40d552da
fbdev_dec.c 8 KB