OSDN Git Service
Michael Niedermayer [Fri, 1 Mar 2013 21:24:30 +0000 (22:24 +0100)]
cpia: use AVFrame accessor functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 21:24:22 +0000 (22:24 +0100)]
tiff: use AVFrame accessor functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 21:23:54 +0000 (22:23 +0100)]
ac3dec: use AVFrame accessor functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 21:23:38 +0000 (22:23 +0100)]
ffprobe: use AVFrame accessor functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 21:03:42 +0000 (22:03 +0100)]
doc/examples/demuxing: use AVFrame accessor functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 21:26:12 +0000 (22:26 +0100)]
avcodec: add ff_frame_get_metadatap()
This is needed for av_dict_*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 1 Mar 2013 15:22:02 +0000 (15:22 +0000)]
lavc/codec_desc: add/fix .props for SGI/DPX/X-face/BRender PIX image
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Joseph Artsimovich [Fri, 1 Mar 2013 13:37:28 +0000 (13:37 +0000)]
Handle an invalid extra mpeg2 picture header following a frame-encoded picture.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 1 Mar 2013 14:54:34 +0000 (14:54 +0000)]
sgidec: use unchecked bytestream2 functions where it makes sense
Overreads can not happen as header size of 512 bytes is required.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Rob Sykes [Fri, 1 Mar 2013 13:29:14 +0000 (14:29 +0100)]
soxr: libsoxr 0.1.1 support
Libsoxr 0.1.1 will be out very soon; no changes planned beyond what's currently in git.
It includes a couple of fixes (not affecting FFmpeg's current usage) and a minor API change (but remains ABI compatible).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 1 Mar 2013 13:10:22 +0000 (13:10 +0000)]
exr: use bytestream functions in pxr24_uncompress()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 1 Mar 2013 12:50:05 +0000 (13:50 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lls: Do not return from void functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 12:44:27 +0000 (13:44 +0100)]
Merge commit '
4da950c0ae224b9b8ef952dadf614be2c050023e'
* commit '
4da950c0ae224b9b8ef952dadf614be2c050023e':
lls: #ifndef --> #if in FF_API_ version guard
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 12:39:47 +0000 (13:39 +0100)]
Merge commit '
e8c52271c45ec27d783e74238dcfad0c2008731c'
* commit '
e8c52271c45ec27d783e74238dcfad0c2008731c':
Revert "Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm."
Conflicts:
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 12:32:12 +0000 (13:32 +0100)]
Merge commit '
399663be9d4a839b894c48a21b62926eb8497d72'
* commit '
399663be9d4a839b894c48a21b62926eb8497d72':
lls: mark max_order as unsigned short
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 12:19:00 +0000 (13:19 +0100)]
Merge commit '
9d4da474f5f40b019cb4cb931c8499deee586174'
* commit '
9d4da474f5f40b019cb4cb931c8499deee586174':
lls: move to the private namespace
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 12:02:57 +0000 (13:02 +0100)]
Merge commit '
7ac6d2423e9bf0f40c67be9a0ca7600b516b0282'
* commit '
7ac6d2423e9bf0f40c67be9a0ca7600b516b0282':
lls: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 11:55:23 +0000 (12:55 +0100)]
Merge commit '
df0229a7caa124dcfb84c34b48d316744c467311'
* commit '
df0229a7caa124dcfb84c34b48d316744c467311':
avconv: Apply codec options to streams that are copied as well
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 11:47:53 +0000 (12:47 +0100)]
Merge commit '
cb6f8245aed2c26fe95c30cd68c45983277a945a'
* commit '
cb6f8245aed2c26fe95c30cd68c45983277a945a':
cmdutils: Allow calling filter_codec_opts without a set encoder
pnm: Use av_pix_fmt_desc_get instead of accessing the array directly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 28 Feb 2013 20:32:02 +0000 (21:32 +0100)]
lls: Do not return from void functions
Diego Biurrun [Thu, 28 Feb 2013 20:31:26 +0000 (21:31 +0100)]
lls: #ifndef --> #if in FF_API_ version guard
Michael Niedermayer [Thu, 28 Feb 2013 23:25:03 +0000 (00:25 +0100)]
ffmpeg: fix variable name in psnr printing code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Feb 2013 23:11:53 +0000 (00:11 +0100)]
libvpxenc: dont redundantly zero fields, the whole context is zeroed on init
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Pascal Massimino [Thu, 28 Feb 2013 22:14:46 +0000 (14:14 -0800)]
libvpxenc: add psnr support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 26 Feb 2013 15:33:22 +0000 (16:33 +0100)]
Revert "Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm."
This reverts commit
f90ff772e7e35b4923c2de429d1fab9f2569b568.
The code should be put back in h264_qpel_8bit.asm, but unfortunately
it is unconditionally used from dsputil_mmx.c since
71155d7.
Michael Niedermayer [Thu, 28 Feb 2013 19:24:05 +0000 (20:24 +0100)]
avformat/lavfi: force probesize to cover at least 30 frames
This ensures that fps and other values are estimated correctly,
the probesize also is intended to limit disk/protocol reads which
does not apply to lavfi inputs at all.
Fixes Ticket1051
Something similar could be usefull to other input devices
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 27 Feb 2013 19:29:39 +0000 (19:29 +0000)]
exr: pxr24 decompression
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 28 Feb 2013 17:37:40 +0000 (17:37 +0000)]
exr: fix error message when pixel type is not set
This only happens with missing chlist attribute from header.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 28 Feb 2013 17:27:22 +0000 (17:27 +0000)]
exr: s/bits_per_color_id/pixel_type
Previous naming was misleading.
Also fix wrong message about missing
support for 32-bit unsigned int pixel type.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 28 Feb 2013 16:50:33 +0000 (16:50 +0000)]
exr: track channels properties
Needed for proper decoding of channels with subsampling
and also for remaining compression methods.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Nicolas George [Wed, 27 Feb 2013 18:19:15 +0000 (19:19 +0100)]
lavf/avio: check for : in filenames for protocols.
If the first "special" character in a filename is a comma,
it can introduce protocol options, but only if there is a
colon at the end. Otherwise, it is just a filename with a
comma.
Fix trac ticket #2303.
Nicolas George [Tue, 26 Feb 2013 19:13:57 +0000 (20:13 +0100)]
lavfi/af_aresample: fix info log for unknown layouts.
Nicolas George [Tue, 26 Feb 2013 19:11:47 +0000 (20:11 +0100)]
lavfi/af_aresample: fix layout consistency check.
If the channel layout is unknown, lswr will internally use
the default one for the corresponding number of channels.
Nicolas George [Wed, 27 Feb 2013 16:47:15 +0000 (17:47 +0100)]
lavf: rescale duration for chained muxers.
Fix trac ticket #2300 because the duration of the segments
was computed using the timestamp of the last packet plus its
duration using the 1/90000 default time base instead of using
the chained muxer time base.
Nicolas George [Wed, 27 Feb 2013 16:53:35 +0000 (17:53 +0100)]
lavc/exr: use size_t instead of int for sizes.
Fix a segfault on 64-bits archs.
Michael Niedermayer [Thu, 28 Feb 2013 17:10:30 +0000 (18:10 +0100)]
loco: silence warning: decoded may be used uninitialized in this function
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Mon, 25 Feb 2013 09:37:39 +0000 (10:37 +0100)]
lls: mark max_order as unsigned short
The value is within 0 and 32.
Remove an `array subscript is below array bounds` warning.
Luca Barbato [Mon, 25 Feb 2013 07:06:59 +0000 (08:06 +0100)]
lls: move to the private namespace
The functions are private.
Luca Barbato [Mon, 25 Feb 2013 06:59:51 +0000 (07:59 +0100)]
lls: K&R formatting cosmetics
Martin Storsjö [Wed, 27 Feb 2013 21:22:39 +0000 (23:22 +0200)]
avconv: Apply codec options to streams that are copied as well
This allows setting/overriding e.g. the bitrate parameter, which
is required for the smoothstreaming muxer. Normally, the bitrate
is set by the demuxer in these cases, but not all demuxers can
provide it. This allows stream copy of data to the smoothstreaming
muxer from such inputs.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 27 Feb 2013 21:21:06 +0000 (23:21 +0200)]
cmdutils: Allow calling filter_codec_opts without a set encoder
In this case, no encoder specific options are filtered, only
options specific to that codec type in general.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 28 Feb 2013 16:05:50 +0000 (18:05 +0200)]
pnm: Use av_pix_fmt_desc_get instead of accessing the array directly
This fixes boken fate tests with MSVC with DLLs, broken since
b5f536d24.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 28 Feb 2013 12:12:04 +0000 (13:12 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: Add a fate test for the noproxy pattern matching
lavf: Handle the environment variable no_proxy more properly
Conflicts:
libavformat/Makefile
libavformat/internal.h
libavformat/tls.c
libavformat/utils.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Feb 2013 11:49:03 +0000 (12:49 +0100)]
Merge commit '
e2c272eb3660d7f4f1d7720980e30f6a617e7eb3'
* commit '
e2c272eb3660d7f4f1d7720980e30f6a617e7eb3':
LICENSE: Move (L)GPLv3 explanation block to a more suitable place
swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 28 Feb 2013 07:57:10 +0000 (08:57 +0100)]
Improve dump_attachment documentation.
Fixes ticket #2299
Michael Niedermayer [Thu, 28 Feb 2013 00:42:55 +0000 (01:42 +0100)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: do not cycle through unavailable show modes
ffplay: add option to disable subtitling
ffplay: use NAN to signal invalid external clock
ffplay: if audio or video clock is invalid return NAN
ffplay: allow frame dropping if we redisplay an already displayed frame
ffplay: return true for pictq_prev_picture if it was successful
ffplay: only quit from audio_decode_frame before decoding when paused
ffplay: drop remaining frames in current audio avpacket when seeking
ffplay: signal seek event to read thread
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Feb 2013 00:25:16 +0000 (01:25 +0100)]
Revert "lavf/utils: add support for special characters encoding in URL"
This reverts commit
4a8fc1d83b1b55e1ac533644168018ebeec0c732.
The commit caused null pointer derefernces when using udp://
after i fixed that it caused ffmpeg to get stuck and remapped
arguments like ?ttl=255 -> ?ttl%3d255
I dont want to leave this broken thus temporary revert so we all
have some time to look at this without half the network protocols
being broken in the meantime
Clément Bœsch [Wed, 27 Feb 2013 23:45:51 +0000 (00:45 +0100)]
build: make iconv build configurable.
Senthilnathan M [Sun, 10 Feb 2013 17:38:52 +0000 (23:08 +0530)]
lavf/utils: add support for special characters encoding in URL
In particular, fix trac ticket #2031.
Signed-off-by: Senthilnathan M <senthilnathan.maadasamy@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Thu, 21 Feb 2013 18:33:07 +0000 (19:33 +0100)]
lavf/concatdec: define "ffcat" and "ffconcat" extensions
Marton Balint [Sat, 23 Feb 2013 01:15:06 +0000 (02:15 +0100)]
ffplay: do not cycle through unavailable show modes
Fixes ticket #2200.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 23 Feb 2013 00:52:23 +0000 (01:52 +0100)]
ffplay: add option to disable subtitling
Fixes ticket #2201.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Fri, 22 Feb 2013 17:18:00 +0000 (18:18 +0100)]
ffplay: use NAN to signal invalid external clock
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 16 Feb 2013 22:36:07 +0000 (23:36 +0100)]
ffplay: if audio or video clock is invalid return NAN
This helps us not to make bad decision (frame dropping, audio compensation)
right after seeking when we do not know yet the recent audio or video clock.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 16 Feb 2013 13:24:34 +0000 (14:24 +0100)]
ffplay: allow frame dropping if we redisplay an already displayed frame
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 9 Feb 2013 23:29:29 +0000 (00:29 +0100)]
ffplay: return true for pictq_prev_picture if it was successful
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 16 Feb 2013 19:56:19 +0000 (20:56 +0100)]
ffplay: only quit from audio_decode_frame before decoding when paused
This way the audio clock is updated to a proper value even when the video is
paused.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 16 Feb 2013 19:53:07 +0000 (20:53 +0100)]
ffplay: drop remaining frames in current audio avpacket when seeking
Fixes ticket #1928.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 16 Feb 2013 19:21:13 +0000 (20:21 +0100)]
ffplay: signal seek event to read thread
Improves seek delay.
Signed-off-by: Marton Balint <cus@passwd.hu>
Clément Bœsch [Wed, 27 Feb 2013 19:58:48 +0000 (20:58 +0100)]
build: fix iconv detection on some systems.
This at least fix the build on CentOS.
Martin Storsjö [Wed, 27 Feb 2013 09:45:16 +0000 (11:45 +0200)]
lavf: Add a fate test for the noproxy pattern matching
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 27 Feb 2013 09:13:47 +0000 (11:13 +0200)]
lavf: Handle the environment variable no_proxy more properly
The handling of the environment variable no_proxy, present since
one of the initial commits (
de6d9b6404), is inconsistent with
how many other applications and libraries interpret this
variable. Its bare presence does not indicate that the use of
proxies should be skipped, but it is some sort of pattern for
hosts that does not need using a proxy (e.g. for a local network).
As investigated by Rudolf Polzer, different libraries handle this
in different ways, some supporting IP address masks, some supporting
arbitrary globbing using *, some just checking that the pattern matches
the end of the hostname without regard for whether it actually is
the right domain or a domain that ends in the same string.
This simple logic should be pretty similar to the logic used by
lynx and curl.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Wed, 27 Feb 2013 18:34:14 +0000 (19:34 +0100)]
LICENSE: Move (L)GPLv3 explanation block to a more suitable place
Nicolas George [Wed, 13 Feb 2013 11:16:47 +0000 (12:16 +0100)]
lavc/libopusenc: report an error if global_quality is set.
Nicolas George [Wed, 6 Feb 2013 14:00:38 +0000 (15:00 +0100)]
ffmpeg: free last sub when using -fix_sub_duration.
Fix trac ticket #2242.
Note: under valid circumstances, when using -fix_sub_duration,
the last subtitle is a dummy termination packet, with no
allocated memory.
Michael Niedermayer [Wed, 27 Feb 2013 17:26:12 +0000 (18:26 +0100)]
Merge remote-tracking branch 'fredjean/master'
* fredjean/master:
Include fix for building ismindex under MinGW
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Frederic Jean [Wed, 27 Feb 2013 17:13:09 +0000 (10:13 -0700)]
Include fix for building ismindex under MinGW
Include cmdutils.h so we can build under windows.
Based on fix for https://ffmpeg.org/trac/ffmpeg/ticket/256
Paul B Mahol [Wed, 27 Feb 2013 16:22:14 +0000 (16:22 +0000)]
exr: simplify decompression path
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 27 Feb 2013 16:19:51 +0000 (17:19 +0100)]
dv: Correctly identify CDVC profile
Fixes Ticket2177
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Feb 2013 16:08:50 +0000 (17:08 +0100)]
vf_lut: correct color/comp permutation
Fixes Ticket2225
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Sat, 22 Sep 2012 01:34:17 +0000 (01:34 +0000)]
swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Sat, 22 Sep 2012 01:34:17 +0000 (01:34 +0000)]
swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Wed, 27 Feb 2013 11:35:13 +0000 (12:35 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Drop some unused function #defines
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Feb 2013 11:22:10 +0000 (12:22 +0100)]
Merge commit '
845cfc92f908791714b8c4c8a49c91b8c64b685e'
* commit '
845cfc92f908791714b8c4c8a49c91b8c64b685e':
x86: dsputil: Drop aliasing of ff_put_pixels8_mmx to ff_put_pixels8_mmxext
Conflicts:
libavcodec/x86/dsputil_mmx.c
Note, the commit message is wrong, there are no mmxext instructions as
claimed in the function. The change should do no harm though
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Feb 2013 10:59:25 +0000 (11:59 +0100)]
Merge commit '
096cc11ec102701a18951b4f0437d609081ca1dd'
* commit '
096cc11ec102701a18951b4f0437d609081ca1dd':
x86: vc1dsp: Move ff_avg_vc1_mspel_mc00_mmxext out of dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Feb 2013 10:50:45 +0000 (11:50 +0100)]
Merge commit '
31a23a0dc663bd42bf593275971b4277a479b73d'
* commit '
31a23a0dc663bd42bf593275971b4277a479b73d':
x86: dsputil_mmx: Remove leftover inline assembly fragments
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Jan 2013 17:38:24 +0000 (18:38 +0100)]
oggdec: chained oggs have timestamp discontinuities
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Feb 2013 02:04:04 +0000 (03:04 +0100)]
avcodec: mbd has a range of 0..2
Fixes Ticket2219
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Feb 2013 01:56:06 +0000 (02:56 +0100)]
mpegvideo_enc: fix gray flag with 444 jpeg
Fixes Ticket2155
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Tue, 26 Feb 2013 23:18:41 +0000 (00:18 +0100)]
ffmpeg_opt: add -to option to specify stop time
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 26 Feb 2013 19:13:14 +0000 (20:13 +0100)]
x86: dsputil: Drop some unused function #defines
Diego Biurrun [Tue, 26 Feb 2013 18:26:03 +0000 (19:26 +0100)]
x86: dsputil: Drop aliasing of ff_put_pixels8_mmx to ff_put_pixels8_mmxext
The external assembly function uses mmxext instructions and should not be
masqueraded as an mmx-only function. Instead, use the mmx-only inline
assembly function.
Diego Biurrun [Tue, 26 Feb 2013 16:29:48 +0000 (17:29 +0100)]
x86: vc1dsp: Move ff_avg_vc1_mspel_mc00_mmxext out of dsputil_mmx.c
Martin Storsjö [Tue, 26 Feb 2013 17:35:51 +0000 (19:35 +0200)]
x86: dsputil_mmx: Remove leftover inline assembly fragments
These became unused in
71155d7b.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 26 Feb 2013 17:55:44 +0000 (18:55 +0100)]
mpeg12: Detect MXF essence stuff at the end of frames
Fixes some of the issues with segment.mov
See: 0226 15:16 Joseph Artsimov (2.1K) [FFmpeg-devel] Two problems with MPEG2 decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Feb 2013 15:50:32 +0000 (16:50 +0100)]
swscale-test: fix 3 pointer type warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Feb 2013 15:36:29 +0000 (16:36 +0100)]
aacsbr: Silence warning: max_qmf_subbands may be used uninitialized in this function
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Feb 2013 12:13:03 +0000 (13:13 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: icc: Drop nonsense adding of cpuflags to LDFLAGS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Feb 2013 12:05:10 +0000 (13:05 +0100)]
Merge commit '
c242bbd8b6939507a1a6fb64101b0553d92d303f'
* commit '
c242bbd8b6939507a1a6fb64101b0553d92d303f':
Remove unnecessary dsputil.h #includes
Conflicts:
libavcodec/ffv1.c
libavcodec/h261dec.c
libavcodec/h261enc.c
libavcodec/h264pred.c
libavcodec/lpc.h
libavcodec/mjpegdec.c
libavcodec/rectangle.h
libavcodec/x86/idct_sse2_xvid.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Feb 2013 11:56:46 +0000 (12:56 +0100)]
Merge commit '
76b19a3984359b3be44d4f7e4e69b7b86729a622'
* commit '
76b19a3984359b3be44d4f7e4e69b7b86729a622':
Fix a number of incorrect intmath.h #includes.
avconv: remove an unused variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Feb 2013 11:50:34 +0000 (12:50 +0100)]
Merge commit '
e8da807537e314d74cb6d93598f1dcfb891fa655'
* commit '
e8da807537e314d74cb6d93598f1dcfb891fa655':
cmdutils: only use libavresample when it is enabled
libschroedinger: cosmetics: rename variable avccontext to avctx
vorbisenc: cosmetics: rename variable avccontext to avctx
Conflicts:
cmdutils.c
libavcodec/libschroedinger.c
libavcodec/libschroedingerenc.c
libavcodec/vorbisenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Feb 2013 11:39:26 +0000 (12:39 +0100)]
Merge commit '
e951b6d94c441d46b396ef12da1428297d77251d'
* commit '
e951b6d94c441d46b396ef12da1428297d77251d':
vorbisdec: cosmetics: rename variable avccontext to avctx
configure: Identify icc compiler with a less ambiguous pattern
Conflicts:
libavcodec/vorbisdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Feb 2013 11:32:17 +0000 (12:32 +0100)]
Merge commit '
b58b00aeca21de00ab6da2944684f784d9d6bc47'
* commit '
b58b00aeca21de00ab6da2944684f784d9d6bc47':
configure: Separate "ln" command line arguments
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Feb 2013 01:32:44 +0000 (02:32 +0100)]
ac3enc_template: silence may be used uninitialized in this function warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 25 Feb 2013 23:32:02 +0000 (00:32 +0100)]
motion-test: fix warning: dsp_mask is deprecated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Feb 2013 01:48:18 +0000 (02:48 +0100)]
libavcodec/motion-test: set the bitexact flag
this is needed for testing mmx2 functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 25 Feb 2013 20:03:47 +0000 (21:03 +0100)]
configure: icc: Drop nonsense adding of cpuflags to LDFLAGS
This fixes many icc warnings when not setting the CPU type.
Diego Biurrun [Sat, 23 Feb 2013 19:10:38 +0000 (20:10 +0100)]
Remove unnecessary dsputil.h #includes
Diego Biurrun [Mon, 25 Feb 2013 21:39:46 +0000 (22:39 +0100)]
Fix a number of incorrect intmath.h #includes.
Justin Ruggles [Mon, 25 Feb 2013 17:26:57 +0000 (12:26 -0500)]
avconv: remove an unused variable