1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavresample
Michael Niedermayer 246eae98cf Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavr: return an error if a avresample_open() is called on an open context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-22 21:12:02 +01:00
..
aarch64 Merge remote-tracking branch 'qatar/master' 2014-01-15 15:49:22 +01:00
arm Merge commit '5bcbb516f2ff45290ef7995b081762e668693672' 2014-02-08 00:48:26 +01:00
x86 Merge commit '99e20125232d40ea239a5b54d26bbfe526506114' 2014-01-13 14:36:55 +01: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 Merge commit '76a75c523cd3c63560185394a0a5cd7249db962a' 2014-02-08 18:38:17 +01:00
audio_mix.c Merge commit 'cc976a75dffa148d655b52604331679ff669e8a2' 2014-01-04 02:30:07 +01: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 '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731' 2014-02-22 21:06:02 +01: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 Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
libavresample.v
Makefile Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
options.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
resample_template.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
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 remote-tracking branch 'qatar/master' 2014-02-22 21:12:02 +01:00
version.h Merge commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731' 2014-02-22 21:06:02 +01:00