Michael Niedermayer b96dddd344 Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5' ...

* commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5':
  lavr: check that current_buffer is not NULL before using it

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-10-28 09:59:53 +01:00

..

arm

…

x86

Merge commit '206895708ea2b464755d340e44501daf9a07c310'

2013-10-14 15:54:23 +02:00

audio_convert.c

Reinstate proper FFmpeg license for all files.

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

audio_convert.h

Reinstate proper FFmpeg license for all files.

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

audio_data.c

Reinstate proper FFmpeg license for all files.

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

audio_data.h

Reinstate proper FFmpeg license for all files.

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

audio_mix_matrix.c

Reinstate proper FFmpeg license for all files.

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

audio_mix.c

Merge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c'

2013-10-13 06:48:35 +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

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00: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

Reinstate proper FFmpeg license for all files.

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

libavresample.v

…

Makefile

…

options.c

Reinstate proper FFmpeg license for all files.

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

resample_template.c

…

resample.c

Reinstate proper FFmpeg license for all files.

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

resample.h

Reinstate proper FFmpeg license for all files.

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

utils.c

Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'

2013-10-28 09:59:53 +01:00

version.h

Reinstate proper FFmpeg license for all files.

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