Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 01:19:29 +0000 (03:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 01:19:47 +0000 (03:19 +0200)
commit40d552dae657d2d690a724c8b1e7ea714998d74f
tree43534ea3562526771f95b821b9e8cbbd7573d24e
parent8e8219e0f0725116809cdd1c17c868cb08da0dec
parent1a3eb042c704dea190c644def5b32c9cee8832b8
Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'

* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
  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: Michael Niedermayer <michaelni@gmx.at>
39 files changed:
ffplay.c
libavdevice/dv1394.c
libavdevice/fbdev_dec.c
libavfilter/setpts.c
libavfilter/vf_crop.c
libavfilter/vf_fieldorder.c
libavformat/asfdec.c
libavformat/avidec.c
libavformat/flvdec.c
libavformat/hevc.c
libavformat/http.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/mmsh.c
libavformat/mmst.c
libavformat/mov.c
libavformat/mov_chan.c
libavformat/mpeg.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/mux.c
libavformat/mxfdec.c
libavformat/mxfenc.c
libavformat/nsvdec.c
libavformat/oggdec.c
libavformat/r3d.c
libavformat/rmdec.c
libavformat/rtmpproto.c
libavformat/rtpdec.c
libavformat/rtpdec_hevc.c
libavformat/rtpenc.c
libavformat/rtsp.c
libavformat/rtspdec.c
libavformat/utils.c
libavresample/audio_convert.c
libavresample/audio_mix.c
libavresample/resample.c
libavresample/utils.c