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> |
||
|---|---|---|
| .. | ||
| aarch64 | ||
| arm | ||
| x86 | ||
| Makefile | ||
| audio_convert.c | ||
| audio_convert.h | ||
| audio_data.c | ||
| audio_data.h | ||
| audio_mix.c | ||
| audio_mix.h | ||
| audio_mix_matrix.c | ||
| avresample-test.c | ||
| avresample.h | ||
| avresampleres.rc | ||
| dither.c | ||
| dither.h | ||
| internal.h | ||
| libavresample.v | ||
| options.c | ||
| resample.c | ||
| resample.h | ||
| resample_template.c | ||
| utils.c | ||
| version.h | ||