Michael Niedermayer d0bf3bf1ff Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  lavf: Detect discontinuities in timestamps for framerate/analyzeduration calculation
  lavf: Initialize the stream info timestamps in avformat_new_stream
  id3v2: Match PIC mimetype/format case-insensitively
  configure: Rename check_asm() to more fitting check_inline_asm()
  fate: Only test enabled filters
  avresample: De-doxygenize some comments where Doxygen is not appropriate
  rtmp: split chunk_size var into in_chunk_size and out_chunk_size
  rtmp: Factorize the code by adding find_tracked_method

Conflicts:
	configure

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

2012-08-12 13:43:03 +02:00

..

x86

x86: add colons after labels

2012-08-07 15:20:56 +01:00

audio_convert.c

Add libavresample

2012-04-24 21:28:27 -04:00

audio_convert.h

doxygen: Fix function parameter names to match the code

2012-08-09 20:05:55 +02:00

audio_data.c

Add libavresample

2012-04-24 21:28:27 -04:00

audio_data.h

Add libavresample

2012-04-24 21:28:27 -04:00

audio_mix_matrix.c

lavr: fix handling of custom mix matrices

2012-08-04 10:28:22 -04:00

audio_mix.c

lavr: fix handling of custom mix matrices

2012-08-04 10:28:22 -04:00

audio_mix.h

doxygen: Fix function parameter names to match the code

2012-08-09 20:05:55 +02:00

avresample-test.c

Add libavresample

2012-04-24 21:28:27 -04:00

avresample.h

lavr: resampling: add filter type and Kaiser window beta to AVOptions

2012-07-08 15:22:11 -04:00

internal.h

lavr: resampling: add filter type and Kaiser window beta to AVOptions

2012-07-08 15:22:11 -04:00

libavresample.v

Add libavresample

2012-04-24 21:28:27 -04:00

Makefile

build: cosmetics: Add missing end-of-line backslashes to item lists.

2012-05-07 14:17:40 +02:00

options.c

lavr: resampling: add filter type and Kaiser window beta to AVOptions

2012-07-08 15:22:11 -04:00

resample_template.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

resample.c

avresample: De-doxygenize some comments where Doxygen is not appropriate

2012-08-11 20:22:01 +02:00

resample.h

Add libavresample

2012-04-24 21:28:27 -04:00

utils.c

Merge remote-tracking branch 'qatar/master'

2012-08-04 23:51:43 +02:00

version.h

Clarify Doxygen comment for FF_API_* #defines.

2012-07-04 15:10:10 +02:00