]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 9 Aug 2013 20:42:28 +0000 (22:42 +0200)]
avformat/nut: support planar rgb
Fixes first half of Ticket2274
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 9 Aug 2013 12:53:55 +0000 (14:53 +0200)]
avcodec/tiff: remove redundant check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 9 Aug 2013 12:53:13 +0000 (14:53 +0200)]
avcodec/tiff: avoid seek back on reading tags
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 9 Aug 2013 11:37:18 +0000 (13:37 +0200)]
avutil/mem: Fix flipped condition
Fixes return code and later null pointer dereference
Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 9 Aug 2013 11:23:10 +0000 (13:23 +0200)]
avformat/paf: Fix integer overflow and out of array read
Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 9 Aug 2013 09:51:20 +0000 (11:51 +0200)]
avfilter/trim: Fix assertion failure with empty frames
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 9 Aug 2013 07:28:11 +0000 (09:28 +0200)]
avfilter/fifo: explicitly assert that a frame should have become available after request
May help tools like coverity
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 9 Aug 2013 06:53:22 +0000 (08:53 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add a TAK test
Conflicts:
tests/fate/lossless-audio.mak
No change as we already have a tak test with luckynight-partial.tak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 9 Aug 2013 05:16:31 +0000 (07:16 +0200)]
Merge commit '
dfc6b5c81491abf7effb97b23af17ccf7adcd132 '
* commit '
dfc6b5c81491abf7effb97b23af17ccf7adcd132 ':
file: Move win32 utf8->wchar open wrapper to libavutil
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sun, 4 Aug 2013 19:07:16 +0000 (21:07 +0200)]
ffplay: check for filter EOF return codes
Fixes ticket #2800.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Tue, 16 Jul 2013 01:04:22 +0000 (03:04 +0200)]
ffplay: ensure the decoder is flushed before exiting or looping
Also make sure that we only exit or restart the video if it is not paused and
if the picture queue is empty.
There is still room for improvement (filters may also buffer some frames), but
the patch fixes the most common use cases and ticket #2783 as well.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 4 Aug 2013 16:49:02 +0000 (18:49 +0200)]
ffplay: fix memleak of non-bitmap subtitles
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 28 Jul 2013 15:32:54 +0000 (17:32 +0200)]
ffplay: free subtitle pictures on exit
Signed-off-by: Marton Balint <cus@passwd.hu>
Michael Niedermayer [Thu, 8 Aug 2013 21:24:31 +0000 (23:24 +0200)]
avfilter/vf_perspective: factor u cliping code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 8 Aug 2013 20:55:19 +0000 (22:55 +0200)]
MAINTAINERS: add Alexander Strasser for the server
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 6 Aug 2013 07:40:54 +0000 (09:40 +0200)]
FATE: add a TAK test
Reimar Döffinger [Thu, 8 Aug 2013 18:02:46 +0000 (20:02 +0200)]
Reduce MAKE_ACCESSORS code duplication via a new header.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Thu, 8 Aug 2013 14:40:19 +0000 (16:40 +0200)]
MAINTAINERS: remove myself from movenc, 2 maintainers should be enough
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
Martin Storsjö [Thu, 8 Aug 2013 08:29:57 +0000 (11:29 +0300)]
file: Move win32 utf8->wchar open wrapper to libavutil
When libavformat was changed to use the new avpriv_open function
in
51eb213d001 , this silently bypassed the existing wrapper for
win32. Move the win32 wrapper into libavutil/file.c to make sure
it gets called everywhere (not just in the libavformat case).
This makes sure that non-ascii file names gets opened properly
(where file names internally are stored as utf8, but they get
converted to wchar_t and opened with _wsopen).
Signed-off-by: Martin Storsjö <martin@martin.st>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Kostya Shishkov [Mon, 5 Aug 2013 10:55:30 +0000 (12:55 +0200)]
Voxware MetaSound decoder
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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.
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 .
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>
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>
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>
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>
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>
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>
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.
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>
Stephen Hutchinson [Wed, 7 Aug 2013 00:57:16 +0000 (20:57 -0400)]
avisynth: Cosmetics
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
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>
Michael Niedermayer [Wed, 7 Aug 2013 00:58:16 +0000 (02:58 +0200)]
MAINTAINERS: alphabetical sort
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Michael Niedermayer [Tue, 6 Aug 2013 14:02:33 +0000 (16:02 +0200)]
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>
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>
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>
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>
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>
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>