* cus/stable:
  ffplay: dont wait 100ms if data is not yet ready
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Also signal the wait if audio buffer is empty. This fixes jerky audio with
realtime sources.
Signed-off-by: Marton Balint <cus@passwd.hu>

Fix Suggested-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Also re-use the allocated buffer instead of re-allocating a new one.

nstreams is assumed to be 1 at that point, so the loop is pointless.

"str" is misleading here (it's often used for string). "sid" makes more
sense to identify a stream id.

There is no point in a distant definition of a small function like this
used only once.

Additional spacing to distinguish better the block.

Fixes compilation with XCode 3.2.6.
Fixes ticket #1736.

* qatar/master:
  mpegvideo: drop unnecessary arguments to hpel_motion()
  mpegvideo: drop 'inline' from some functions
  nellymoserdec: drop support for s16 output.
  bmpdec: only initialize palette for pal8.
  build: Properly remove object files while cleaning
  flacdsp: arm optimised lpc filter
  compat/vsnprintf: return number of bytes required on truncation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* commit '3f7fd59d':
  avformat: fix typo in avformat_close_input
  mp3enc: write Xing TOC
  mp3enc: support MPEG-2 and MPEG-2.5 in Xing header.
  mp3enc: downgrade some errors in writing Xing frame to warnings
  lavf: flush the output AVIOContext in av_write_trailer().
  lavf: cosmetics, reformat av_write_trailer().
  avio: flush the internal buffer in avio_close()
  Enhance doc on asyncts audiofilter
  cmdutils: avoid setting data pointers to invalid values in alloc_buffer()
  libavcodec: remove av_destruct_packet_nofree()

Conflicts:
	libavcodec/avpacket.c
	libavformat/mp3enc.c
	libavformat/nutenc.c
	libavformat/utils.c
	libavformat/version.h
	tests/ref/lavf/voc
	tests/ref/lavf/voc_s16
Merged-by: Michael Niedermayer <michaelni@gmx.at>

These arguments are either constants or copies of MpegEncContext
fields just as easily accessed within the function.
Signed-off-by: Mans Rullgard <mans@mansr.com>

These functions do not benefit from being inlined.  They are large,
and there are no opportunities for constant propagation.
Signed-off-by: Mans Rullgard <mans@mansr.com>

It internally decodes as float and then converts to s16 by a call to
float_to_int16(). The caller can do this just as well by using lavr.

Gray8 is not considered to be paletted, so this would cause an invalid
write.

Fixes bug 367.

CC: libav-stable@libav.org

Some implementations of sscanf do not handle a space before a trailing %n
properly.

As an example, MSVC's does this for the second insatnce in this patch, for
an input of "0x3:c0=c1:c1=c0":
    1) Match the final "c0" or "c1".
    2) Realize it's at the end of the string.
    3) Check for %n.
    4) There is no %n, but a space instead.
    5) Leave 'len' unitilialized.

So, move it out of the sscanf format strings, and call skip_spaces instead.

This bug does not affect skip_spaces since %n is the first and only formatting
string.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

A proper implementation was introduced in
ba537202 for MSVC, and
MinGW already has vsnprintf.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This conforms to C99, but requires Windows >= XP.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

MSVC-built binaries should not be stripped.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Previously, object files in, for example, compat/ were left
after a clean or distclean was run.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Remove a bogus warning when using segment_list_type csv.

The LIST_TYPE_EXT constant is only used internally, so it can
be removed when the feature (segment_list_type ext) gets removed.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

Rename a local variable to make the code more self-explanatory.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

Should also be faster (though I doubt that hardly ever matters
for the usage here).

Also remove the pointer copy. Since we do not need to reset the
pointer to the start of the string, it is not needed anymore.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

This updated version does not deviate from previous behavior on default value of 'buffer_size'

I skipped porting 'sources', 'block' options for now as they're parsed seriously. So i added TODO remarks.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

It is all dead and rotting code.

Also, move yuvcmp.c to tools. Its license is non-existent, however,
and should be clarified.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This conforms to C99, but requires Windows >= XP.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>