dnxhdenc: add space between function argument type and comment.

Signed-off-by: Martin Storsjö <martin@martin.st>
dsputilenc_mmx: split assignment of ff_sse16_sse2 to SSE2 section.
nutdec: set duration_estimation_method

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wmaenc: change another assert to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wmaenc: fix off by 1 error in quantization loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wmaenc: remove alternative quantization loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wmaenc: rewrite 2nd stage quantization code

this is faster and more correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec_encode_audio2: print error messages for errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
swr: fix MMX resample code, add emms

Fixes Ticket1495

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: re-set frame_size after filter graph reset.

The filter contexts are completely cleared,
so the frame size can not be kept.
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputilenc_mmx: split assignment of ff_sse16_sse2 to SSE2 section.
  dnxhdenc: add space between function argument type and comment.
  x86: fmtconvert: add special asm for float_to_int16_interleave_misc_*
  attributes: Add a definition of av_always_inline for MSVC
  cmdutils: Pass the actual chosen encoder to filter_codec_opts
  os_support: Add fallback definitions for stat flags
  os_support: Rename the poll fallback function to ff_poll
  network: Check for struct pollfd
  os_support: Don't compare a negative number against socket descriptors
  os_support: Include all the necessary headers for the win32 open function
  x86: vc1: fix and enable optimised loop filter

Conflicts:
	cmdutils.c
	cmdutils.h
	ffmpeg.c
	ffplay.c
	libavformat/os_support.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: only configure video filters after we got the first frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ARM: generate position independent code to access data symbols

This creates proper position independent code when accessing
data symbols if CONFIG_PIC is set.

References to external symbols should now use the movrelx macro.
Some additional code changes are required since this macro may
need a register to hold the GOT pointer.

Signed-off-by: Mans Rullgard <mans@mansr.com>
x86: cpu: clean up check for cpuid instruction support

This adds macros for accessing the EFLAGS register and uses
these instead of coding the entire check in inline asm.

Signed-off-by: Mans Rullgard <mans@mansr.com>
wma: Lower the maximum number of channels to 2

ff_wma_init is used only by wmadec and wmaenc, and neither of them
can handle more than 2 channels.

This fixes crashes with invalid files.

Based on patch by Piotr Bandurski and Michael Niedermayer.

Signed-off-by: Martin Storsjö <martin@martin.st>
wmaenc: switch all remaining asserts to av_asserts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ituh263dec: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
mathematics: Don't use division by zero in NAN/INFINITY macros

Some compilers, MSVC among them, don't recognize the divisions by
zero as meaning infinity/nan.

These macros should, according to the standard, expand to constant
expressions, but this shouldn't matter for our usage.

Signed-off-by: Martin Storsjö <martin@martin.st>
opt/eval: Include mathematics.h for NAN/INFINITY

These files use NAN/INFINITY but didn't include mathematics.h to get
the fallback definitions if the system lacks the macros.

Signed-off-by: Martin Storsjö <martin@martin.st>
lavf/segment: pass the top level chained muxer format context to segment_end()

Consistent with segment_start() and less confusing.