Michael Niedermayer 40d552dae6 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>

2015-04-20 03:19:47 +02:00

..

aarch64

Merge commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99'

2015-02-20 22:13:07 +01:00

arm

Merge commit '12655c48049f9a52e5504bde90fe738862b0ff08'

2015-02-22 00:06:23 +01:00

x86

Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'

2014-04-05 19:16:39 +02:00

audio_convert.c

Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'

2015-04-20 03:19:47 +02:00

audio_convert.h

Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924'

2014-04-22 23:33:07 +02:00

audio_data.c

Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'

2014-08-04 02:49:48 +02:00

audio_data.h

Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'

2014-08-04 02:49:48 +02:00

audio_mix_matrix.c

Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'

2014-10-18 22:53:23 +02:00

audio_mix.c

Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'

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

avresample-test.c

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

avresample.h

Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'

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 '12655c48049f9a52e5504bde90fe738862b0ff08'

2015-02-22 00:06:23 +01:00

libavresample.v

…

Makefile

Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'

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_template.c

Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83'

2014-04-11 20:39:04 +02:00

resample.c

Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'

2015-04-20 03:19:47 +02:00

resample.h

Merge commit 'cae8df78759c2e69257f7fe58842f34c0d98a7ec'

2014-04-25 01:17:15 +02:00

utils.c

Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'

2015-04-20 03:19:47 +02:00

version.h

Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'

2014-08-10 18:20:37 +02:00