* commit '463a7cde':
  Differentiate assembler and assembly in documentation and comments

Conflicts:
	configure
	doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0ef256d5':
  libx264: Correctly manage constant rate factor params

Conflicts:
	libavcodec/libx264.c

See: 3a1c8951Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '73953df7':
  Replace av_malloc() and memset(0) by av_mallocz()

Conflicts:
	libavformat/matroskadec.c
	libavformat/rmdec.c
	libavformat/utils.c

No change, as none of the split malloc+memset existed in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f83896ab':
  ape: Replace memset(0) by zero initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8d695dc4':
  mpeg: Mark ff_mpeg_set_erpic() static
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a6a675a7':
  configure: Drop stray error resilience dependencies

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

* commit 'fbf4d219':
  build: Record explicit dependency of intrax8 on error resilience

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

* commit 'c54e1187':
  build: Have the eatqi decoder depend on the MPEG-1 decoder

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

* commit '85d805d5':
  build: Add missing object files for webm muxer

Conflicts:
	libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '03391b54':
  build: Add missing object files for Matroska demuxer

Conflicts:
	libavcodec/Makefile
	libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '49470b94':
  build: Add missing replaygain object file for CAF demuxer

Conflicts:
	libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

With threads the decoder has a delay and will thus have multiple
frames at EOF left in its buffers which will be returned when flushing
the decoder. The code that extracts such frames from the decoder at the
end does not pull frames from the filtergraph, thus when one of these
frames causes the filtergraph to be reinited, the frames still inside
the graph at that point re lost

This commit changes the flushing to be more similar to normal decoding
and 1 frame at a time

Fixes hqx fate with threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The language and the program that consumes the language are not the same.

fix ticket #2024
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fixess part of ticket #2024
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

By default they are set to -1.

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

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

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '9a9e2f1c':
  dsputil: Split audio operations off into a separate context

Conflicts:
	configure
	libavcodec/takdec.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil.asm
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

It is not used outside of the file.

eatqi uses more than just the shared mpegvideo bits.

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

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

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

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

This avoids reading uninitialized bytes and confusing valgrind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This avoids reading uninitialized bytes and confusing valgrind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

This is useful to understand how it's different from the original code.