mirror of https://git.ffmpeg.org/ffmpeg.git
40d552dae6
* 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> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| alldevices.c | ||
| alsa.c | ||
| alsa.h | ||
| alsa_dec.c | ||
| alsa_enc.c | ||
| avdevice.c | ||
| avdevice.h | ||
| avdeviceres.rc | ||
| avfoundation.m | ||
| bktr.c | ||
| caca.c | ||
| decklink_common.cpp | ||
| decklink_common.h | ||
| decklink_common_c.h | ||
| decklink_dec.cpp | ||
| decklink_dec.h | ||
| decklink_dec_c.c | ||
| decklink_enc.cpp | ||
| decklink_enc.h | ||
| decklink_enc_c.c | ||
| dshow.c | ||
| dshow_capture.h | ||
| dshow_common.c | ||
| dshow_crossbar.c | ||
| dshow_enummediatypes.c | ||
| dshow_enumpins.c | ||
| dshow_filter.c | ||
| dshow_pin.c | ||
| dv1394.c | ||
| dv1394.h | ||
| fbdev_common.c | ||
| fbdev_common.h | ||
| fbdev_dec.c | ||
| fbdev_enc.c | ||
| file_open.c | ||
| gdigrab.c | ||
| iec61883.c | ||
| internal.h | ||
| jack.c | ||
| lavfi.c | ||
| libavdevice.v | ||
| libcdio.c | ||
| libdc1394.c | ||
| openal-dec.c | ||
| opengl_enc.c | ||
| opengl_enc_shaders.h | ||
| oss.c | ||
| oss.h | ||
| oss_dec.c | ||
| oss_enc.c | ||
| pulse_audio_common.c | ||
| pulse_audio_common.h | ||
| pulse_audio_dec.c | ||
| pulse_audio_enc.c | ||
| qtkit.m | ||
| sdl.c | ||
| sndio.c | ||
| sndio.h | ||
| sndio_dec.c | ||
| sndio_enc.c | ||
| timefilter.c | ||
| timefilter.h | ||
| utils.c | ||
| v4l.c | ||
| v4l2-common.c | ||
| v4l2-common.h | ||
| v4l2.c | ||
| v4l2enc.c | ||
| version.h | ||
| vfwcap.c | ||
| x11grab.c | ||
| xcbgrab.c | ||
| xv.c | ||