Signed-off-by: Marton Balint <cus@passwd.hu>

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

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

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

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

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

Such buffers are not malloced thus freeing would be bad.
Note though this condition never could have happened so this
is more for correctness sake and not a true bugfix

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

* qatar/master:
  arm: Add assembly version of h264_find_start_code_candidate
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '218d6844':
  h264dsp: Factorize code into a new function, h264_find_start_code_candidate

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

* commit '7a82022e':
  h264_parser: Initialize the h264dsp context in the parser as well
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3e589878':
  Voxware MetaSound decoder

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

* commit '5afe1d27':
  avio: Add const qualifiers to ffio_read_indirect

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

* commit '0f1fb6c0':
  libavutil: Don't use fcntl if the function does not exist
  cmdutils: Only do the windows-specific commandline parsing on _WIN32
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '51eb213d':
  libavformat: use avpriv_open()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '71bf6b41':
  libavdevice: use avpriv_open()

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

* commit 'fee9db1f':
  libavcodec: use avpriv_open()

Conflicts:
	libavcodec/libxvid_rc.c

The changed code does not exist in ffmpeg anymore, thus nothing is
changed.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '880391ed':
  libavutil: use avpriv_open()

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

Not all platforms have the function.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>

               Before          After
               Mean   StdDev   Mean   StdDev  Change
This function   508.8 23.4      185.4  9.0    +174.4%
Overall        3068.5 31.7     2752.1 29.4     +11.5%

In combination with the preceding patch:
                Before          After
                Mean   StdDev   Mean   StdDev  Change
Overall         2925.6 26.2     2752.1 29.4     +6.3%
Signed-off-by: Martin Storsjö <martin@martin.st>

This performs the start code search which was previously part of
h264_find_frame_end() - the most CPU intensive part of the function.

By itself, this results in a performance regression:
              Before          After
              Mean   StdDev   Mean   StdDev  Change
Overall time  2925.6 26.2     3068.5 31.7    -4.7%

but this can more than be made up for by platform-optimised
implementations of the function.
Signed-off-by: Martin Storsjö <martin@martin.st>

Each AVStream struct for an H.264 elementary stream actually has two
copies of the H264DSPContext struct (and in fact all the other members
of H264Context as well):

((H264Context *) ((AVStream *)st)->codec->priv_data)->h264dsp
((H264Context *) ((AVStream *)st)->parser->priv_data)->h264dsp

but only the first of these was actually being initialised. This
prevented the addition of platform-specific implementations of
parser-related functions.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit '869b04e8':
  libavutil: add avpriv_open() to open files with close-on-exec flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '22c87905':
  mpegvideo_enc: drop outdated copy_picture_attributes() in favour of a modern av_frame_copy_props()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f4d371b9':
  rtsp: Don't include the listen flag in the SDP demuxer flags
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This provides at least some protection against potential accidental
corruption of AVIO buffer workspace.
Signed-off-by: Martin Storsjö <martin@martin.st>

Not all platforms have the function.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>

Fixes commandline parsing on Cygwin (on 64 bit, and on very recent
32 bit), where the configure check does find the CommandLineToArgvW
function (since it exists in the link libraries and in the headers),
but whose GetCommandLineW() only returns the application's path.
(This is due to a cygwin internal optimization, see
http://cygwin.com/ml/cygwin/2013-07/msg00538.html for details.)
Arguments are only given through main's argc/argv, and they're already
UTF-8.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

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

Fixes gcc warnings
Fixes CID1061056
Fixes CID1061057
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

* cigaes/master:
  ffmpeg: remove obsolete workaround in trim insertion.
  lavu/log: do not skip overwritten lines.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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