added start_number parameter to drawtext to permit an offset to n/frame_num var
lavfi: math typo in interlace filter

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
swresample/x86/audio_convert: add emms to CONV

Might fix Ticket1874

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: math typo in interlace filter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer()

This simplifies the code and avoids using libavcodec-specific
avcodec_fill_audio_frame().
avutil/frame: Try to align width to achive linesize[0] alignment

This results in more alignment for pixel formats that have "odd" pixel
sizes like RGB24. It makes access through SIMD easier

Works around Issue described in Ticket1031

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Add maintainer for WebVTT demuxer and muxer

Matthew J Heaney is added to the list of ffmpeg maintainers, for the
WebVTT demuxer and muxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
doc/decoders: Document libcelt

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ff_gen_search: make step 64it to prevent hypothetical integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ff_gen_search: fix limit

The limit value could become slightly wrong in the last iteration

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ff_gen_search: fix infinite loop

Fixes Ticket2639

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
add the start_number offset to var_values[VAR_N] directly, instead of adding it in func_frame_num
Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/encoders: Add libopencore-amrnb doc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer()

Conflicts:
	libavfilter/audio.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
sonicenc: set supported samples formats array

This ensures that only supported formats are input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
sonicenc: dont put multiple assignments per line

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
sonicenc: fix off by 1 error

Fixes out of array accesses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Autodetect idcin only if audio properties allow decoding.

Fixes ticket #2688.