Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket3152

This also removes the dependance on ff_init_block_index/ff_update_block_index()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* qatar/master:
  libx265: Only use one memcpy for headers

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

* commit '60728e8b':
  libx265: Write global extradata when requested

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

* commit '8ef33497':
  build: Add config option for CABAC code

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

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

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

* qatar/master:
  avconv: don't warn on multiple frames per packet for codecs that expect it
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '47543450':
  avconv: print verbose per-stream transcoding statistics

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

* commit 'a220b07b':
  avconv: split printing the final statistics into a separate function

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

They're guaranteed by the x265 API to be contiguous in memory.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

They're guaranteed by the x265 API to be contiguous in memory.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Matroska, MP4, and other containers require it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

* commit 'baeb59d8':
  avconv: rewrite output data size tracking

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

* commit 'f759f66e':
  avconv: explicitly report when the muxing overhead is unknown

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

* commit '781d97fd':
  avconv: remove unused nb_frames_dup

Conflicts:
	ffmpeg.c

No change, as the variable is not unused
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This allows for more elegant dependency and object declarations.

* commit 'b4679ecd':
  {v,a}f_showinfo: print frame side data

Conflicts:
	libavfilter/af_ashowinfo.c
	libavfilter/vf_showinfo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '15c5a8d2':
  mp3dec: export replaygain tags from ID3v2

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

* commit '06c3cd3c':
  af_volume: support using replaygain frame side data

Conflicts:
	doc/filters.texi
	libavfilter/af_volume.c
	libavfilter/af_volume.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd161ae0a':
  frame: add a function for removing side data from a frame

Conflicts:
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '59444c76':
  avconv: add stream-global side data to the first demuxed packet

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

* commit '4a0f6651':
  libavcodec: when decoding, copy replaygain side data to decoded frames

Conflicts:
	libavcodec/internal.h
	libavcodec/rawdec.c
	libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5a7e35dd':
  Add replaygain side data type and code for parsing replaygain tags.

Conflicts:
	libavcodec/avcodec.h
	libavcodec/version.h
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '25b32586':
  lavf: add an AVStream field for exporting stream-global side data

Conflicts:
	libavformat/utils.c
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0e2c3ee9':
  lavc: give a typedeffed name to the AVPacket.side_data struct

Conflicts:
	doc/APIchanges
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Store a variable per OutputStream instead of globals for
audio/video/extradata. This makes the code simpler and cleaner and fixes
2pass with multiple output streams.

Frame duplication now happens in vf_fps.

* qatar/master:
  configure: Remove dcbzl check for e500v1 and e500v2 architectures

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