Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-02-11 04:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity
ffmpeg/libavresample
History
Michael Niedermayer 40d552dae6 Merge commit '1a3eb042c7' 
* commit '1a3eb042c7':
  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>
2015-04-20 03:19:47 +02:00
..
aarch64 Merge commit 'df0891fc8f' 2015-02-20 22:13:07 +01:00
arm Merge commit '12655c4804' 2015-02-22 00:06:23 +01:00
x86 Merge commit '01c5779f56' 2014-04-05 19:16:39 +02:00
audio_convert.c Merge commit '1a3eb042c7' 2015-04-20 03:19:47 +02:00
audio_convert.h Merge commit 'f4d5a2cc35' 2014-04-22 23:33:07 +02:00
audio_data.c Merge commit 'fbc0b86599' 2014-08-04 02:49:48 +02:00
audio_data.h Merge commit 'fbc0b86599' 2014-08-04 02:49:48 +02:00
audio_mix.c Merge commit '1a3eb042c7' 2015-04-20 03:19:47 +02:00
audio_mix.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
audio_mix_matrix.c Merge commit '963f761448' 2014-10-18 22:53:23 +02:00
avresample-test.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
avresample.h Merge commit 'fb1ddcdc8f' 2014-08-10 18:20:37 +02:00
avresampleres.rc Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
dither.c Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
dither.h Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
internal.h Merge commit '12655c4804' 2015-02-22 00:06:23 +01:00
libavresample.v
Makefile Merge commit '449511740f' 2014-05-13 22:40:32 +02:00
options.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
resample.c Merge commit '1a3eb042c7' 2015-04-20 03:19:47 +02:00
resample.h Merge commit 'cae8df7875' 2014-04-25 01:17:15 +02:00
resample_template.c Merge commit '254c95cdd1' 2014-04-11 20:39:04 +02:00
utils.c Merge commit '1a3eb042c7' 2015-04-20 03:19:47 +02:00
version.h Merge commit 'fb1ddcdc8f' 2014-08-10 18:20:37 +02:00