ffmpeg.git
5 years agoMAINTAINERS: add myself as maintainer for lavf/aiff* and lavf/movenc.c
Matthieu Bouron [Tue, 6 Aug 2013 21:08:05 +0000 (22:08 +0100)]
MAINTAINERS: add myself as maintainer for lavf/aiff* and lavf/movenc.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/bitstream: Dont try to free buffers for static VLCs
Michael Niedermayer [Thu, 8 Aug 2013 13:05:48 +0000 (15:05 +0200)]
avcodec/bitstream: Dont try to free buffers for static VLCs

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>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 8 Aug 2013 10:51:46 +0000 (12:51 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Add assembly version of h264_find_start_code_candidate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '218d6844b37d339ffbf2044ad07d8be7767e2734'
Michael Niedermayer [Thu, 8 Aug 2013 10:38:10 +0000 (12:38 +0200)]
Merge commit '218d6844b37d339ffbf2044ad07d8be7767e2734'

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

Conflicts:
libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7a82022ee2f9b1fad991ace0936901e7419444be'
Michael Niedermayer [Thu, 8 Aug 2013 10:28:57 +0000 (12:28 +0200)]
Merge commit '7a82022ee2f9b1fad991ace0936901e7419444be'

* commit '7a82022ee2f9b1fad991ace0936901e7419444be':
  h264_parser: Initialize the h264dsp context in the parser as well

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3e5898782dce60334ab294821ca00b19c648cf66'
Michael Niedermayer [Thu, 8 Aug 2013 10:10:39 +0000 (12:10 +0200)]
Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'

* commit '3e5898782dce60334ab294821ca00b19c648cf66':
  Voxware MetaSound decoder

Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0'
Michael Niedermayer [Thu, 8 Aug 2013 10:04:46 +0000 (12:04 +0200)]
Merge commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0'

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

Conflicts:
libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520'
Michael Niedermayer [Thu, 8 Aug 2013 09:54:10 +0000 (11:54 +0200)]
Merge commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520'

* commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520':
  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>
5 years agoMerge commit '51eb213d00154b8e7856c7667ea62db8b0f663d4'
Michael Niedermayer [Thu, 8 Aug 2013 09:47:07 +0000 (11:47 +0200)]
Merge commit '51eb213d00154b8e7856c7667ea62db8b0f663d4'

* commit '51eb213d00154b8e7856c7667ea62db8b0f663d4':
  libavformat: use avpriv_open()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '71bf6b41d974229a06921806c333ce98566a5d8a'
Michael Niedermayer [Thu, 8 Aug 2013 09:36:21 +0000 (11:36 +0200)]
Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a'

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

Conflicts:
libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fee9db1fdf921295233e94cbe2769f9cd722206d'
Michael Niedermayer [Thu, 8 Aug 2013 09:28:23 +0000 (11:28 +0200)]
Merge commit 'fee9db1fdf921295233e94cbe2769f9cd722206d'

* commit 'fee9db1fdf921295233e94cbe2769f9cd722206d':
  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>
5 years agoMerge commit '880391ed2d2faf796ca3a16f63cec69767546a21'
Michael Niedermayer [Thu, 8 Aug 2013 09:18:17 +0000 (11:18 +0200)]
Merge commit '880391ed2d2faf796ca3a16f63cec69767546a21'

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

Conflicts:
libavutil/random_seed.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavutil: Don't use fcntl if the function does not exist
Derek Buitenhuis [Wed, 7 Aug 2013 23:44:37 +0000 (19:44 -0400)]
libavutil: Don't use fcntl if the function does not exist

Not all platforms have the function.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarm: Add assembly version of h264_find_start_code_candidate
Ben Avison [Mon, 5 Aug 2013 12:12:48 +0000 (13:12 +0100)]
arm: Add assembly version of h264_find_start_code_candidate

               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>
5 years agoh264dsp: Factorize code into a new function, h264_find_start_code_candidate
Ben Avison [Mon, 5 Aug 2013 12:12:47 +0000 (13:12 +0100)]
h264dsp: Factorize code into a new function, h264_find_start_code_candidate

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>
5 years agoh264_parser: Initialize the h264dsp context in the parser as well
Ben Avison [Mon, 5 Aug 2013 12:12:46 +0000 (13:12 +0100)]
h264_parser: Initialize the h264dsp context in the parser as well

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>
5 years agoMerge commit '869b04e89154cd92d2bcfdabcecbe3217864c099'
Michael Niedermayer [Thu, 8 Aug 2013 09:07:46 +0000 (11:07 +0200)]
Merge commit '869b04e89154cd92d2bcfdabcecbe3217864c099'

* commit '869b04e89154cd92d2bcfdabcecbe3217864c099':
  libavutil: add avpriv_open() to open files with close-on-exec flag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoVoxware MetaSound decoder
Kostya Shishkov [Mon, 5 Aug 2013 10:55:30 +0000 (12:55 +0200)]
Voxware MetaSound decoder

5 years agoMerge commit '22c879057ead189c0f59241cb9eeb926381e3299'
Michael Niedermayer [Thu, 8 Aug 2013 08:48:36 +0000 (10:48 +0200)]
Merge commit '22c879057ead189c0f59241cb9eeb926381e3299'

* commit '22c879057ead189c0f59241cb9eeb926381e3299':
  mpegvideo_enc: drop outdated copy_picture_attributes() in favour of a modern av_frame_copy_props()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f4d371b9737c0405b3bc46d7ca0c856c0a8616b1'
Michael Niedermayer [Thu, 8 Aug 2013 08:41:24 +0000 (10:41 +0200)]
Merge commit 'f4d371b9737c0405b3bc46d7ca0c856c0a8616b1'

* commit 'f4d371b9737c0405b3bc46d7ca0c856c0a8616b1':
  rtsp: Don't include the listen flag in the SDP demuxer flags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavio: Add const qualifiers to ffio_read_indirect
Ben Avison [Wed, 7 Aug 2013 22:22:38 +0000 (23:22 +0100)]
avio: Add const qualifiers to ffio_read_indirect

This provides at least some protection against potential accidental
corruption of AVIO buffer workspace.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolibavutil: Don't use fcntl if the function does not exist
Derek Buitenhuis [Wed, 7 Aug 2013 23:44:37 +0000 (19:44 -0400)]
libavutil: Don't use fcntl if the function does not exist

Not all platforms have the function.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agocmdutils: Only do the windows-specific commandline parsing on _WIN32
Diogo Franco [Wed, 7 Aug 2013 11:25:51 +0000 (08:25 -0300)]
cmdutils: Only do the windows-specific commandline parsing on _WIN32

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>
5 years agoswscale/utils: Fix potential overflow of srcPos*C before converting to 64bit
Michael Niedermayer [Thu, 8 Aug 2013 00:56:26 +0000 (02:56 +0200)]
swscale/utils: Fix potential overflow of srcPos*C  before converting to 64bit

Fixes CID1061054

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/utils: Fix potential overflow of dstPos*xInc before converting to 64bit
Michael Niedermayer [Thu, 8 Aug 2013 00:51:52 +0000 (02:51 +0200)]
swscale/utils: Fix potential overflow of dstPos*xInc before converting to 64bit

Fixes CID1061053

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/opt: fix types passed to the format string "%s"
Michael Niedermayer [Thu, 8 Aug 2013 00:39:24 +0000 (02:39 +0200)]
avutil/opt: fix types passed to the format string "%s"

Fixes gcc warnings
Fixes CID1061056
Fixes CID1061057

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavformat: use avpriv_open()
Rémi Denis-Courmont [Tue, 6 Aug 2013 18:19:28 +0000 (21:19 +0300)]
libavformat: use avpriv_open()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agolibavdevice: use avpriv_open()
Rémi Denis-Courmont [Tue, 6 Aug 2013 18:19:27 +0000 (21:19 +0300)]
libavdevice: use avpriv_open()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agolibavcodec: use avpriv_open()
Rémi Denis-Courmont [Tue, 6 Aug 2013 18:19:26 +0000 (21:19 +0300)]
libavcodec: use avpriv_open()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agolibavutil: use avpriv_open()
Rémi Denis-Courmont [Tue, 6 Aug 2013 18:19:25 +0000 (21:19 +0300)]
libavutil: use avpriv_open()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agolibavutil: add avpriv_open() to open files with close-on-exec flag
Rémi Denis-Courmont [Tue, 6 Aug 2013 18:19:24 +0000 (21:19 +0300)]
libavutil: add avpriv_open() to open files with close-on-exec flag

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agompegvideo_enc: drop outdated copy_picture_attributes() in favour of a modern av_frame...
Vittorio Giovara [Fri, 2 Aug 2013 07:25:45 +0000 (09:25 +0200)]
mpegvideo_enc: drop outdated copy_picture_attributes() in favour of a modern av_frame_copy_props()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Wed, 7 Aug 2013 15:39:42 +0000 (17:39 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  ffmpeg: remove obsolete workaround in trim insertion.
  lavu/log: do not skip overwritten lines.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoav_frame_copy_props: fix unintended self assignment
Michael Niedermayer [Wed, 7 Aug 2013 15:27:07 +0000 (17:27 +0200)]
av_frame_copy_props: fix unintended self assignment

Fixes CID1061052

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/oggparsevorbis: fix leak of tt
Michael Niedermayer [Wed, 7 Aug 2013 15:20:39 +0000 (17:20 +0200)]
avformat/oggparsevorbis: fix leak of tt

Fixes CID1061059
Fixes fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/oggparsevorbis: fix leak of ct
Michael Niedermayer [Wed, 7 Aug 2013 15:18:19 +0000 (17:18 +0200)]
avformat/oggparsevorbis: fix leak of ct

Fixes CID1061058
Fixes fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoff_flac_parse_picture: assert that len is within the array
Michael Niedermayer [Wed, 7 Aug 2013 14:50:59 +0000 (16:50 +0200)]
ff_flac_parse_picture: assert that len is within the array

The check that gurantees this isnt recognized by coverity for
example

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/g2meet: fix src pointer checks in kempf_decode_tile()
Michael Niedermayer [Wed, 7 Aug 2013 13:50:26 +0000 (15:50 +0200)]
avcodec/g2meet: fix src pointer checks in kempf_decode_tile()

Fixes Ticket2842

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: remove obsolete workaround in trim insertion.
Nicolas George [Wed, 7 Aug 2013 12:46:07 +0000 (14:46 +0200)]
ffmpeg: remove obsolete workaround in trim insertion.

The bug it was working seems to have been fixed.
This change causes ffmpeg to use the trim filter to implement
the -t option.
FATE tests are updated due to the more accurate handling of
the last packets.

5 years agolavu/log: do not skip overwritten lines.
Nicolas George [Wed, 7 Aug 2013 13:50:27 +0000 (15:50 +0200)]
lavu/log: do not skip overwritten lines.

If the line ends with \r, it will not flood the tty, and
the "Last message repeated" line would overwrite it.
Fix bug introduced by c25d1ba.

5 years agoavcodec/jpeg2000dec: check sample sepration for validity
Michael Niedermayer [Wed, 7 Aug 2013 13:02:38 +0000 (15:02 +0200)]
avcodec/jpeg2000dec: check sample sepration for validity

Fixes division by 0
Fixes Ticket2841

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortsp: Don't include the listen flag in the SDP demuxer flags
Martin Storsjö [Wed, 7 Aug 2013 07:46:38 +0000 (10:46 +0300)]
rtsp: Don't include the listen flag in the SDP demuxer flags

It's only relevant for the RTSP demuxer. Similarly, the custom_io
flag is only present in the SDP demuxer options list.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 7 Aug 2013 10:14:39 +0000 (12:14 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead

Conflicts:
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '62572435d4106098c090fb8f129a9090e41ff1eb'
Michael Niedermayer [Wed, 7 Aug 2013 10:04:59 +0000 (12:04 +0200)]
Merge commit '62572435d4106098c090fb8f129a9090e41ff1eb'

* commit '62572435d4106098c090fb8f129a9090e41ff1eb':
  rtpenc_chain: Check for errors from ffio_fdopen and ffio_open_dyn_packet_buf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f542dedf72091af8e6f32a12bd64289c58857c21'
Michael Niedermayer [Wed, 7 Aug 2013 09:51:45 +0000 (11:51 +0200)]
Merge commit 'f542dedf72091af8e6f32a12bd64289c58857c21'

* commit 'f542dedf72091af8e6f32a12bd64289c58857c21':
  rtspenc: Check the return value from ffio_open_dyn_packet_buf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Add -lstdc++ to the requirements for linking with libgme.
Stephen Hutchinson [Wed, 7 Aug 2013 00:56:25 +0000 (20:56 -0400)]
configure: Add -lstdc++ to the requirements for linking with libgme.

Needed for cross-compiling with MinGW-w64

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodeprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead
Kostya Shishkov [Tue, 6 Aug 2013 07:57:05 +0000 (09:57 +0200)]
deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead

Voxware is the name of company, it has produced several audio codecs e.g.
MetaVoice family and MetaSound.

5 years agoavisynth: Exit gracefully when trying to serve video from v2.5.8.
Stephen Hutchinson [Wed, 7 Aug 2013 00:57:17 +0000 (20:57 -0400)]
avisynth: Exit gracefully when trying to serve video from v2.5.8.

'Fixes' ticket #2526 insofar as it stops 2.5.8 from crashing and
tells the user to upgrade to 2.6 if they want to make video input
work. A real solution to #2526 would be to get video input from
2.5.8 to work right.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavisynth: Cosmetics
Stephen Hutchinson [Wed, 7 Aug 2013 00:57:16 +0000 (20:57 -0400)]
avisynth: Cosmetics

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortpenc_chain: Check for errors from ffio_fdopen and ffio_open_dyn_packet_buf
Martin Storsjö [Wed, 7 Aug 2013 07:20:07 +0000 (10:20 +0300)]
rtpenc_chain: Check for errors from ffio_fdopen and ffio_open_dyn_packet_buf

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortspenc: Check the return value from ffio_open_dyn_packet_buf
Martin Storsjö [Wed, 7 Aug 2013 07:07:48 +0000 (10:07 +0300)]
rtspenc: Check the return value from ffio_open_dyn_packet_buf

Also clear the AVIOContext handle after freeing, to avoid
possible dangling pointers if the later call fails.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMAINTAINERS: alphabetical sort
Michael Niedermayer [Wed, 7 Aug 2013 00:58:16 +0000 (02:58 +0200)]
MAINTAINERS: alphabetical sort

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: Add some maintainers for parts of libavutil
Michael Niedermayer [Sun, 4 Aug 2013 09:43:22 +0000 (11:43 +0200)]
MAINTAINERS: Add some maintainers for parts of libavutil

Developers added are active and in the copyright of the specified files,

If anyone wants to maintain anything else, send a patch that adds you to
MAINTAINERS.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: fix memleak with nobuffer
Michael Niedermayer [Tue, 6 Aug 2013 23:14:45 +0000 (01:14 +0200)]
avformat/utils: fix memleak with nobuffer

Fixes Ticket2802

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/hmac: make const tables static const
Michael Niedermayer [Tue, 6 Aug 2013 18:30:55 +0000 (20:30 +0200)]
avutil/hmac: make const tables static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/spdifenc make const tables static const
Michael Niedermayer [Tue, 6 Aug 2013 18:30:36 +0000 (20:30 +0200)]
avformat/spdifenc make const tables static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/smoothstreamingenc: Make const tables static const
Michael Niedermayer [Tue, 6 Aug 2013 18:30:12 +0000 (20:30 +0200)]
avformat/smoothstreamingenc: Make const tables static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegts: remove usage of MOD_UNLIKELY()
Michael Niedermayer [Tue, 6 Aug 2013 17:56:20 +0000 (19:56 +0200)]
mpegts: remove usage of MOD_UNLIKELY()

Its not needed and doing nothing is faster than doing a optimized MOD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 6 Aug 2013 17:40:50 +0000 (19:40 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pcm_bluray: Return AVERROR_INVALIDDATA instead of -1 on header errors

Conflicts:
libavcodec/pcm-mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6fb65973c9501d3fe94a5a9195c01cd20083066e'
Michael Niedermayer [Tue, 6 Aug 2013 17:33:46 +0000 (19:33 +0200)]
Merge commit '6fb65973c9501d3fe94a5a9195c01cd20083066e'

* commit '6fb65973c9501d3fe94a5a9195c01cd20083066e':
  configure: Properly split dv1394 indev dependencies

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'
Michael Niedermayer [Tue, 6 Aug 2013 17:29:02 +0000 (19:29 +0200)]
Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'

* commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7':
  configure: Properly set zlib dependencies for all components

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a'
Michael Niedermayer [Tue, 6 Aug 2013 17:21:29 +0000 (19:21 +0200)]
Merge commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a'

* commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a':
  configure: The W64 demuxer should select the WAV demuxer, not depend on it

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '406e6c0ba5393fa302080202fe77bd09187889a1'
Michael Niedermayer [Tue, 6 Aug 2013 17:03:33 +0000 (19:03 +0200)]
Merge commit '406e6c0ba5393fa302080202fe77bd09187889a1'

* commit '406e6c0ba5393fa302080202fe77bd09187889a1':
  configure: Properly split avserver component and system dependencies

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b'
Michael Niedermayer [Tue, 6 Aug 2013 16:30:26 +0000 (18:30 +0200)]
Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b'

* commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b':
  riff: Move demuxing code to a separate file.

Conflicts:
configure
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472'
Michael Niedermayer [Tue, 6 Aug 2013 16:07:59 +0000 (18:07 +0200)]
Merge commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472'

* commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472':
  riff: Move muxing code to a separate file

Conflicts:
configure
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fcc455ff2e11ed04603aead1984a92ac3a4be226'
Michael Niedermayer [Tue, 6 Aug 2013 16:01:03 +0000 (18:01 +0200)]
Merge commit 'fcc455ff2e11ed04603aead1984a92ac3a4be226'

* commit 'fcc455ff2e11ed04603aead1984a92ac3a4be226':
  avformat/dv: K&R formatting cosmetics

Conflicts:
libavformat/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'abe5268c3328bf0e8fcfb7dc6e231b8920177c3a'
Michael Niedermayer [Tue, 6 Aug 2013 15:53:01 +0000 (17:53 +0200)]
Merge commit 'abe5268c3328bf0e8fcfb7dc6e231b8920177c3a'

* commit 'abe5268c3328bf0e8fcfb7dc6e231b8920177c3a':
  tcp: Use a different log message and level if there's more addresses to try

Conflicts:
libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2a0ec47bd70ebb79e8b2d2f956feeb3a813df798'
Michael Niedermayer [Tue, 6 Aug 2013 15:20:47 +0000 (17:20 +0200)]
Merge commit '2a0ec47bd70ebb79e8b2d2f956feeb3a813df798'

* commit '2a0ec47bd70ebb79e8b2d2f956feeb3a813df798':
  unix: Convert from AVERROR to errno range before comparing error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 6 Aug 2013 14:48:16 +0000 (16:48 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec/options: Drop deprecation warning suppression macros

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '971cce7ebb48a58e72e4dc57b3008e2682bcf4e7'
Michael Niedermayer [Tue, 6 Aug 2013 14:41:38 +0000 (16:41 +0200)]
Merge commit '971cce7ebb48a58e72e4dc57b3008e2682bcf4e7'

* commit '971cce7ebb48a58e72e4dc57b3008e2682bcf4e7':
  riff.h: Remove stray extern declaration for non-existing symbol

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab'
Michael Niedermayer [Tue, 6 Aug 2013 14:36:25 +0000 (16:36 +0200)]
Merge commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab'

* commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab':
  twinvq: Split VQF-specific part from common TwinVQ decoder core

Conflicts:
libavcodec/Makefile
libavcodec/twinvq.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4d8d16b596c63de85e52488734338fbb41238058'
Michael Niedermayer [Tue, 6 Aug 2013 14:29:28 +0000 (16:29 +0200)]
Merge commit '4d8d16b596c63de85e52488734338fbb41238058'

* commit '4d8d16b596c63de85e52488734338fbb41238058':
  twinvq: Prefix enums and defines shared with VoxWare MetaSound

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bc909626b0a3c107625f2cb4c85479d18de422a8'
Michael Niedermayer [Tue, 6 Aug 2013 14:24:02 +0000 (16:24 +0200)]
Merge commit 'bc909626b0a3c107625f2cb4c85479d18de422a8'

* commit 'bc909626b0a3c107625f2cb4c85479d18de422a8':
  twinvq: move all bitstream reading into single place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a22ae9f0c579793f411e2bd7a8db557091a3a4ae'
Michael Niedermayer [Tue, 6 Aug 2013 14:14:33 +0000 (16:14 +0200)]
Merge commit 'a22ae9f0c579793f411e2bd7a8db557091a3a4ae'

* commit 'a22ae9f0c579793f411e2bd7a8db557091a3a4ae':
  mpegts: Remove one 64-bit integer modulus operation per packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '43bacd5b7d3d265a77cd29d8abb131057796aecc'
Michael Niedermayer [Tue, 6 Aug 2013 14:02:33 +0000 (16:02 +0200)]
Merge commit '43bacd5b7d3d265a77cd29d8abb131057796aecc'

* commit '43bacd5b7d3d265a77cd29d8abb131057796aecc':
  vc1: check mb_height validity.

See: b5f4836f8cb374f1a5ae45db48b61a1dfba0daad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '090cd0631140ac1a3a795d2adfac5dbf5e381aa2'
Michael Niedermayer [Tue, 6 Aug 2013 13:56:01 +0000 (15:56 +0200)]
Merge commit '090cd0631140ac1a3a795d2adfac5dbf5e381aa2'

* commit '090cd0631140ac1a3a795d2adfac5dbf5e381aa2':
  vc1: check the source buffer in vc1_mc functions

Conflicts:
libavcodec/vc1dec.c

See: 3a04c18d899d278eea551c216e5117974063062b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9991298f2c4d9022ad56057f15d037e18d454157'
Michael Niedermayer [Tue, 6 Aug 2013 13:45:03 +0000 (15:45 +0200)]
Merge commit '9991298f2c4d9022ad56057f15d037e18d454157'

* commit '9991298f2c4d9022ad56057f15d037e18d454157':
  bink: Bound check the quantization matrix.

See: e70144cba13db208877e3b64802fc8835c72e82d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bb9378251a167ef0116f263912e57f715c1e02ac'
Michael Niedermayer [Tue, 6 Aug 2013 13:39:59 +0000 (15:39 +0200)]
Merge commit 'bb9378251a167ef0116f263912e57f715c1e02ac'

* commit 'bb9378251a167ef0116f263912e57f715c1e02ac':
  network: Use SOCK_CLOEXEC when available

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '605387582bd35920b83a26dabbe1c0601f425621'
Michael Niedermayer [Tue, 6 Aug 2013 13:32:12 +0000 (15:32 +0200)]
Merge commit '605387582bd35920b83a26dabbe1c0601f425621'

* commit '605387582bd35920b83a26dabbe1c0601f425621':
  lavf: Support unix sockets

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bc54c2ae3ca6abd225dc331eafc12108513158de'
Michael Niedermayer [Tue, 6 Aug 2013 13:26:04 +0000 (15:26 +0200)]
Merge commit 'bc54c2ae3ca6abd225dc331eafc12108513158de'

* commit 'bc54c2ae3ca6abd225dc331eafc12108513158de':
  libx264: add shortcut for the bluray compatibility option

Conflicts:
doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c84ea750cf765c9d8845fca5546eb0ae25b9c855'
Michael Niedermayer [Tue, 6 Aug 2013 13:16:26 +0000 (15:16 +0200)]
Merge commit 'c84ea750cf765c9d8845fca5546eb0ae25b9c855'

* commit 'c84ea750cf765c9d8845fca5546eb0ae25b9c855':
  mpegts: Make discard_pid() faster for single-program streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cabb1681697555e2c319c37c1f30f149207e9434'
Michael Niedermayer [Tue, 6 Aug 2013 13:11:55 +0000 (15:11 +0200)]
Merge commit 'cabb1681697555e2c319c37c1f30f149207e9434'

* commit 'cabb1681697555e2c319c37c1f30f149207e9434':
  mpegts: Remove one memcpy per packet

Conflicts:
libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'daf1e0d3de03bd424016e2a7520e4e94ece5c0ac'
Michael Niedermayer [Tue, 6 Aug 2013 13:02:23 +0000 (15:02 +0200)]
Merge commit 'daf1e0d3de03bd424016e2a7520e4e94ece5c0ac'

* commit 'daf1e0d3de03bd424016e2a7520e4e94ece5c0ac':
  avio: Add an internal function for reading without copying

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '22a154e4363b351dd9f321003de01dffebd2fa18'
Michael Niedermayer [Tue, 6 Aug 2013 12:56:14 +0000 (14:56 +0200)]
Merge commit '22a154e4363b351dd9f321003de01dffebd2fa18'

* commit '22a154e4363b351dd9f321003de01dffebd2fa18':
  build: Add missing img2.o dependency to apetag.o

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc'
Michael Niedermayer [Tue, 6 Aug 2013 12:50:21 +0000 (14:50 +0200)]
Merge commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc'

* commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc':
  ismindex: Replace mkdir ifdeffery by os_support.h #include

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vdpau: include attributes.h, needed for attribute_deprecated
Michael Niedermayer [Tue, 6 Aug 2013 12:49:03 +0000 (14:49 +0200)]
avcodec/vdpau: include attributes.h, needed for attribute_deprecated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vdpau.h: define FF_API_BUFS_VDPAU if its not defined
Michael Niedermayer [Tue, 6 Aug 2013 12:36:14 +0000 (14:36 +0200)]
avcodec/vdpau.h: define FF_API_BUFS_VDPAU if its not defined

Similar to 50fb8c1114b9c2b7d299cbc17a18a457d12069a8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f824535a4a79c260b59d3178b8d958217caffd78'
Michael Niedermayer [Tue, 6 Aug 2013 12:30:49 +0000 (14:30 +0200)]
Merge commit 'f824535a4a79c260b59d3178b8d958217caffd78'

* commit 'f824535a4a79c260b59d3178b8d958217caffd78':
  vdpau: deprecate bitstream buffers within the hardware context

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2852740e23f91d6775714d7cc29b9a73e1111ce0'
Michael Niedermayer [Tue, 6 Aug 2013 12:25:08 +0000 (14:25 +0200)]
Merge commit '2852740e23f91d6775714d7cc29b9a73e1111ce0'

* commit '2852740e23f91d6775714d7cc29b9a73e1111ce0':
  vdpau: store picture data in picture's rather than codec's context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vdpau.h: define FF_API_CAP_VDPAU if its not defined
Michael Niedermayer [Tue, 6 Aug 2013 12:03:40 +0000 (14:03 +0200)]
avcodec/vdpau.h: define FF_API_CAP_VDPAU if its not defined

Prevent build failure for applicatins using the old API
This could be replaced be a include of version.h but some applications
would then need extern C wrapers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '549294fbbe1c00fee37dc4d3f291b98945e11094'
Michael Niedermayer [Tue, 6 Aug 2013 11:54:05 +0000 (13:54 +0200)]
Merge commit '549294fbbe1c00fee37dc4d3f291b98945e11094'

* commit '549294fbbe1c00fee37dc4d3f291b98945e11094':
  vdpau: deprecate VDPAU codec capability

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'
Michael Niedermayer [Tue, 6 Aug 2013 11:45:21 +0000 (13:45 +0200)]
Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'

* commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909':
  vdpau: deprecate old codec-specific pixel formats

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'
Michael Niedermayer [Tue, 6 Aug 2013 11:24:22 +0000 (13:24 +0200)]
Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'

* commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8':
  vdpau: remove old-style decoders

Conflicts:
libavcodec/allcodecs.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4videodec.c
libavcodec/vc1dec.c
libavcodec/vdpau.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopcm_bluray: Return AVERROR_INVALIDDATA instead of -1 on header errors
Christian Schmidt [Tue, 6 Aug 2013 08:21:42 +0000 (10:21 +0200)]
pcm_bluray: Return AVERROR_INVALIDDATA instead of -1 on header errors

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoMerge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'
Michael Niedermayer [Tue, 6 Aug 2013 10:35:48 +0000 (12:35 +0200)]
Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'

* commit '488a0fa68973d48e264d54f1722f7afb18afbea7':
  avconv: support -t as an input option.

Conflicts:
Changelog
ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_opt: Remove support for specifying -t anywhere to set the duration
Michael Niedermayer [Tue, 6 Aug 2013 09:58:40 +0000 (11:58 +0200)]
ffmpeg_opt: Remove support for specifying -t anywhere to set the duration

This would otherwise conflict with the semantics of using -t for the input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'
Michael Niedermayer [Tue, 6 Aug 2013 08:57:04 +0000 (10:57 +0200)]
Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'

* commit '811bd0784679dfcb4ed02043a37c92f9df10500e':
  avconv: make input -ss accurate when transcoding

Conflicts:
Changelog
doc/ffmpeg.texi
ffmpeg.h
ffmpeg_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Properly split dv1394 indev dependencies
Diego Biurrun [Tue, 6 Aug 2013 00:36:17 +0000 (02:36 +0200)]
configure: Properly split dv1394 indev dependencies

5 years agoconfigure: Properly set zlib dependencies for all components
Diego Biurrun [Tue, 6 Aug 2013 00:31:33 +0000 (02:31 +0200)]
configure: Properly set zlib dependencies for all components

5 years agoconfigure: The W64 demuxer should select the WAV demuxer, not depend on it
Diego Biurrun [Mon, 5 Aug 2013 21:05:30 +0000 (23:05 +0200)]
configure: The W64 demuxer should select the WAV demuxer, not depend on it