* commit 'e1f3847f':
  mace: Make sure that the channel count is set to a valid value

Conflicts:
	libavcodec/mace.c

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

* commit '1115689d':
  svq3: Check for any negative return value from ff_h264_check_intra_pred_mode

Conflicts:
	libavcodec/svq3.c

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

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

* qatar/master:
  rtmp: rename main_channel_id to stream_id.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd4aef997':
  rtmp: Follow Flash player numbering for channels.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '120af23c':
  rtmp: Send video on a separate channel.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '68b46774':
  lavf: Make probe_codec return an error code

Conflicts:
	libavformat/utils.c

A failure to reallocate should not free the array as it is used
to probe the codec. And failure to reallocate if the following
probe succeeds isnt a fatal error for probe_codec(). Thus this
is only partially merged to ensure probing still is attempted
with the data available.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1daea523':
  x86: Add an xmm clobbering wrapper for avcodec_encode_video2

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

* commit '73084391':
  lavf: Don't explicitly flush after each written packet in muxers

Conflicts:
	libavformat/assenc.c
	libavformat/yuv4mpeg.c

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

* commit '596e5d47':
  lavf: Add a flag to enable/disable per-packet flushing

Conflicts:
	libavformat/avformat.h
	libavformat/mux.c
	libavformat/version.h

This adds a 2nd API to set per packet flushing
If the user application indicates through either a non default then this non default takes
precedence over the other still default value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0a9425d7':
  flv: Do not export datastream as metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* 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>

Also return a proper error code.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

Also pass on any returned error code.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

This more closely corresponds to the usage of the field.
Its usage here is unrelated to the channel ID.
Signed-off-by: Martin Storsjö <martin@martin.st>

Channel 4 is typically used by the Flash player to transmit
audio, channel 6 for video, and various stream-specific invokes
get sent over channel 8, which is designated the source channel.

This more closely matches the behavior of the Flash player,
including the transmission of play requests over channel 8.
Signed-off-by: Martin Storsjö <martin@martin.st>

Sending non-monotonic packets (e.g. when the audio and video
streams are monotonic within themselves but not muxed
monotonically) will lead to negative values the RTMP timestamp
field (where timestamps are transmitted only as deltas for each
channel), and this delta can end up being incorrectly written as
a large unsigned number.
Signed-off-by: Martin Storsjö <martin@martin.st>

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>

This allows handling errors from av_realloc properly.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

Since 596e5d47, this is not necessary anymore. It also allows to
actually disable the flushing, improving write performance (but
possibly giving worse latency in real-time streaming).
Signed-off-by: Martin Storsjö <martin@martin.st>

This is enabled by default and can be disabled with
"-fflags -flush_packets".

Inspired by a patch from Nicolas George <nicolas.george@normalesup.org>.
Signed-off-by: Martin Storsjö <martin@martin.st>

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>

It is used internally.

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