* commit 'fce28c3c':
  mov: fill in subtitle dimensions after parsing tkhd

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

* commit '96138e8c':
  isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()

Conflicts:
	libavformat/isom.c

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

* commit '9bd4a9f4':
  isom: Simplify mov_rewrite_dvd_sub_extradata()

Conflicts:
	libavformat/isom.c

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

* commit '3e4e2142':
  fate: Convert the paletted output in the brenderpix tests to rgb24
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Sample-Id: NeroRecodeSample.mp4

Sample-Id: NeroRecodeSample.mp4

This avoids the 2nd buffer and fixes the palette truncated check

This makes the output consistent on big-endian systems.

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

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

* qatar/master:
  avconv: make the ASCII flow charts narrower to fit onto TTY

Conflicts:
	doc/ffmpeg.texi

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

* commit '68e95ab8':
  dnxhdenc: return meaningful return codes

Conflicts:
	libavcodec/dnxhdenc.c

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

* commit '9e4e35b4':
  avconv_opt: fix avio_open2() return code check

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

Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

These charts in man page are currently destroyed.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

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

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

This should have no effect currently as there are no such options yet.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This allows calling the function without the need to check if the
dictionary contains any entries
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avio_open2() only return < 0 when error.

Padding rule described here http://msdn.microsoft.com/en-us/library/windows/desktop/dd390707(v=vs.85).aspxSigned-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* qatar/master:
  golomb: Fix the implementation of get_se_golomb_long
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '53c20f17':
  vp8: K&R formatting cosmetics

Conflicts:
	libavcodec/vp8.c
	libavcodec/vp8.h
	libavcodec/vp8data.h
	libavcodec/vp8dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This was only used in hevc muxing code so far.

This makes the return values match what get_se_golomb returns for
the same bitstream reader instances.

The logic for producing a signed golomb code out of an unsigned one
was based on the corresponding code in get_se_golomb, which operated
directly on the bitstream reader buffer - not on the equivalent
return value from get_ue_golomb.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit 'lukaszmluki/master^':
  lavd/pulse_audio_enc: implement get_device_list callback
  lavd/pulse_audio_dec: implement get_device_list callback
  lavd/pulse_audio_common: add device detecting code
  lavu/mem: add av_dynarray_add_nofree function
  lavd/pulse_audio_enc: implement write_uncoded_frame callback
  tools/uncoded_frame: fix audio codec generation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

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

* qatar/master:
  movenc: Add dvd subtitle support
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '85698be4':
  cmdutils: Mark exit_program as av_noreturn
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

av_dynarray_add_nofree function have similar functionality
as existing av_dynarray_add, but it doesn't deallocate memory
on fails.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Provided implementation doesn't support planar formats yet.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Codec id is guessed from uninitialized sample format.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>