* commit '92ed83e3':
  rtmp: Store all the notify messages
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fe0337e8':
  rtmp: Do not send the first field twice within the handshake
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '666ed7ed':
  rtmp: Drop an unneeded warning
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ffb7669e':
  rtmp: Support play method in listen mode
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '97d35fa8':
  rtmp: Factor out publish specific code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3feb3d6c':
  mem: Introduce av_reallocp

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

This is required since 187105ff when we started trying to
wrap this function as well.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit '187105ff':
  Fix references to deleted avcodec_encode_video() function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* cehoyos/master:
  Do not suggest to increase probesize for image2 files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Re-wording a log message that's no longer true and changing its
severity level to debug.

Signed-off by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

ensures no stale pointers remain
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avoids leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Adding support for end trimming Opus embedded in Ogg container.

Signed-Off By: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The onTextData is used to implement text data streams in flv.

Apparently a widely used streaming server requires that the second
field always presents a version during C1 phase.

Will be reused for supporting play.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

This ensures that there are no stale pointers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

* qatar/master:
  avpacket: Fix error checking in packet_alloc

Conflicts:
	libavcodec/avpacket.c

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

* commit '6fc8226e':
  vp3: Check the framerate for validity

Conflicts:
	libavcodec/vp3.c

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

* commit 'ac9d1590':
  proresdec: Properly make sure an index doesn't run past the limit

Conflicts:
	libavcodec/proresdec_lgpl.c

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

* commit 'e90a6846':
  cavsdec: Make sure a sequence header has been decoded before decoding pictures

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

* commit '5bbfe193':
  vocdec: Don't update codec parameters mid-stream
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0ef1660a':
  sierravmd: Do sanity checking of frame sizes

Conflicts:
	libavformat/sierravmd.c

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

* commit '342c43d1':
  omadec: Properly check lengths before incrementing the position

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

* commit 'a06a5b78':
  mathops/x86: work around inline asm miscompilation with GCC 4.8.1

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