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

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

Signed-off-by: Paul B Mahol <onemda@gmail.com>

for the n0=0 case there are multiple solutions and different
platforms pick different ones
This should reduce the issues with fate and the timefilter test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  h264_sei: K&R formatting cosmetics

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

* commit '4c7fd58f':
  h264_sei: Remove pointless old comment
  twinvq: Add proper twinvq prefixes to identifiers
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f900f35a':
  flvdec: Eliminate completely silly goto
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e4529df9':
  flvdec: K&R formatting cosmetics

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

* commit '390b4d70':
  flvdec: Fix = vs. == typo in sample rate check
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fd8f91e3':
  rtsp: Simplify code for forming the remote peer url
Merged-by: Michael Niedermayer <michaelni@gmx.at>

23 lines less
less error prone as theres no more need to update *_size on every read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Based on a patch by Reimar Döffinger.
http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-September/131610.htmlSigned-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Increase visibility, in order to decrease troubleshooting for
users generating non playable H.264 content.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

Fixes ticket #2731.

Fixes ticket #2157.

* qatar/master:
  avframe: have av_frame_get_side_data take const AVFrame*
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ee37d581':
  rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_url
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '1851e1d0':
  rtpproto: Check the size before reading buf[1]
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7748dd41':
  avconv: add -n option to immediately exit when output files already exist

Conflicts:
	Changelog
	doc/ffmpeg.texi
	ffmpeg_opt.c

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

* commit 'b85dbe68':
  avconv: Call exit_program instead of exit in avconv_opt as well

Conflicts:
	ffmpeg_opt.c

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

* commit 'c7e921a5':
  avopt: Check whether the object actually has got an AVClass

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

* commit 'b7e6da98':
  rtpproto: Move rtpproto specific function declarations to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '892b0be1':
  rtpproto: Simplify the rtp_read function by looping over the fds
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7531588f':
  rtpproto: Remove a misplaced comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '54e03ff6':
  rtpproto: Support nonblocking reads
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2e814d03':
  rtpenc: Simplify code by introducing a macro for rescaling NTP timestamps
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '45dd1ae1':
  avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs

Conflicts:
	libavfilter/buffer.c
	libavfilter/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'c2e936de':
  tree-test: Refactor and plug memory leaks

Conflicts:
	libavutil/tree.c

Most of this commit is not merged due to bugs in it
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Martin Storsjö <martin@martin.st>

* commit 'a9b04b2c':
  tree.h: K&R formatting and typo cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>