OSDN Git Service
Michael Niedermayer [Fri, 19 Oct 2012 12:15:47 +0000 (14:15 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Add proper dependencies in qt.mak
fate: Add proper dependencies in lossless-video.mak
indeo3: do not try to output more lines than we can fit
bmv: get a new frame on every decode_frame(), so we can use direct rendering
Conflicts:
libavcodec/bmv.c
tests/fate/lossless-video.mak
tests/fate/qt.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 11:58:14 +0000 (13:58 +0200)]
Merge commit '
1cd432e167b1a80853760c89a33606e2b5f229c2'
* commit '
1cd432e167b1a80853760c89a33606e2b5f229c2':
configure: fix libcdio check
rtsp: Allow setting the reordering buffer size via an AVOption
rtsp: Vertically align a constant definition
rtp: Update the check for distinguishing between RTP and RTCP
aac: fix build with hardcoded tables
fate: dependencies for screen codec tests
riff: Move functions around to be covered by appropriate #ifdefs
Conflicts:
configure
tests/fate/screen.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 11:47:47 +0000 (13:47 +0200)]
Merge commit '
0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'
* commit '
0af1fe845a9d7112da0a58d33a4fc81fe7c47e95':
avformat: Fix references to the removed function av_write_header in comments
changelog: Mention the MSVC DLL support
fate: add dependencies for misc microsoft codecs
fate-twinvq: add dependencies
fate-mpc: add dependencies
fate-indeo: add dependencies
fate-als: add dependencies
fate: dependencies for demux tests
Conflicts:
Changelog
tests/Makefile
tests/fate/demux.mak
tests/fate/microsoft.mak
tests/fate/mpc.mak
tests/fate/vqf.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 11:29:24 +0000 (13:29 +0200)]
Merge commit '
c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'
* commit '
c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72':
fate: add a dependency helper macro
Add support for building shared libraries with MSVC
avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab
gxf: Add a local copy of the relevant parts of the frame rate table
configure: Split out msvc as a separate target OS
aviobuf: Remove a senseless ifdef in avio_seek
Conflicts:
configure
libavcodec/dirac.c
libavcodec/mpeg12data.h
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 18 Oct 2012 22:49:15 +0000 (01:49 +0300)]
fate: Add proper dependencies in qt.mak
The output of make fate-list is identical to before.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 18 Oct 2012 21:35:32 +0000 (00:35 +0300)]
fate: Add proper dependencies in lossless-video.mak
The output of make fate-list is identical to before.
Signed-off-by: Martin Storsjö <martin@martin.st>
Kostya Shishkov [Thu, 18 Oct 2012 09:45:42 +0000 (11:45 +0200)]
indeo3: do not try to output more lines than we can fit
Internally chroma planes have multiple of four height while allocated image
planes might be smaller if CODEC_FLAG_EMU_EDGE is set. Thus we should not
output more lines of chroma than frame can accept.
Also the decoder can be safely switched to direct rendering now.
Kostya Shishkov [Thu, 18 Oct 2012 09:08:01 +0000 (11:08 +0200)]
bmv: get a new frame on every decode_frame(), so we can use direct rendering
Michael Niedermayer [Fri, 19 Oct 2012 01:36:42 +0000 (03:36 +0200)]
tiffenc: fix integer overflow
Fixes CID700699
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 01:15:06 +0000 (03:15 +0200)]
roqvideodec: replace dead code by assert
Fixes CID732195
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 00:53:06 +0000 (02:53 +0200)]
roqaudioenc: Fix crash with very small roq files
Fixes CID703669
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 17 Oct 2012 08:27:54 +0000 (08:27 +0000)]
lavc/tta: do not overwrite bits_per_coded_sample
It is supposed to be set in libavformat only.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 17 Oct 2012 15:42:24 +0000 (15:42 +0000)]
kmvc: use meaningful error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 17 Oct 2012 14:45:00 +0000 (14:45 +0000)]
xxan: return more meaningful error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 17 Oct 2012 14:32:14 +0000 (14:32 +0000)]
lavc/yop: remove redudant YOP in av_log() messages
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 17 Oct 2012 14:27:13 +0000 (14:27 +0000)]
jvdec: use more meaningful error code
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 17 Oct 2012 14:04:12 +0000 (14:04 +0000)]
idcinvideo: if decoding fails return error
Previously if frame decoding failed it would be
silently reported as valid frame.
The fate ref is updated because sample have
truncated last video packet.
While here return meaningful error codes.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 17 Oct 2012 12:41:17 +0000 (12:41 +0000)]
lavc/c93: use meaningful error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Mans Rullgard [Thu, 18 Oct 2012 21:38:12 +0000 (22:38 +0100)]
configure: fix libcdio check
The compiler/linker flags passed to check_lib2 should not be quoted.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Thu, 18 Oct 2012 23:20:27 +0000 (01:20 +0200)]
motionpixels/mp_decode_frame_helper: assert that the first pixel doesnt reuse the last.
reusing the last would use uninitialized data, this should be
impossible currently, but better to check by assert.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Oct 2012 22:05:03 +0000 (00:05 +0200)]
mlp_parser: print error when ff_combine_frame() fails to add the current buffer
Fixes part of CID602338
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 14 Oct 2012 01:08:30 +0000 (03:08 +0200)]
lavc: add raw text subtitles decoder.
Martin Storsjö [Wed, 17 Oct 2012 12:46:30 +0000 (15:46 +0300)]
rtsp: Allow setting the reordering buffer size via an AVOption
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 17 Oct 2012 12:24:46 +0000 (15:24 +0300)]
rtsp: Vertically align a constant definition
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 16 Oct 2012 22:45:39 +0000 (01:45 +0300)]
rtp: Update the check for distinguishing between RTP and RTCP
Also add enums for more RTCP packet types, according to the IANA
list of registered types.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 18 Oct 2012 19:51:04 +0000 (21:51 +0200)]
ff_convert_matrix: fix integer overflow
Fixes CID608053
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Oct 2012 19:42:31 +0000 (21:42 +0200)]
mpegvideoenc: check return value of ff_MPV_frame_start()
Fixes CID703622
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Oct 2012 19:42:04 +0000 (21:42 +0200)]
lzwenc: change assert to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Oct 2012 18:49:20 +0000 (20:49 +0200)]
bmv: remove unreachable default case
Fixes CID732191
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Thu, 18 Oct 2012 14:32:11 +0000 (15:32 +0100)]
aac: fix build with hardcoded tables
aac_tablegen.h includes aac.h for the POW_SF2_ZERO definition, but
this also pulls in a raft of other headers, some of which are not
safe to use in code built with the host compiler.
Moving POW_SF2_ZERO to aac_tablegen_decl.h, where the declaration
of the array it relates to already resides, fixes the problems.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Thu, 18 Oct 2012 18:41:51 +0000 (20:41 +0200)]
indeo4: prevent printing uninitialized variable
Fixes CID703822
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Oct 2012 18:29:03 +0000 (20:29 +0200)]
dv: change assert(a2 < 4) to av_assert()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 18 Oct 2012 15:48:14 +0000 (17:48 +0200)]
fate: dependencies for screen codec tests
Diego Biurrun [Wed, 17 Oct 2012 19:32:13 +0000 (21:32 +0200)]
riff: Move functions around to be covered by appropriate #ifdefs
This fixes compilation with --disable-muxers.
Michael Niedermayer [Thu, 18 Oct 2012 02:58:20 +0000 (04:58 +0200)]
riff: retry reading metadata without padding if it fails with
Fixes Ticket1821
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Oct 2012 02:57:27 +0000 (04:57 +0200)]
riff: dont discard truncated metadata
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 17 Oct 2012 19:45:23 +0000 (22:45 +0300)]
avformat: Fix references to the removed function av_write_header in comments
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 18 Oct 2012 12:06:49 +0000 (15:06 +0300)]
changelog: Mention the MSVC DLL support
Also retroactively add a changelog entry to the 9beta1 list
for general MSVC support, which was present there already.
Signed-off-by: Martin Storsjö <martin@martin.st>
Mans Rullgard [Thu, 18 Oct 2012 02:19:41 +0000 (03:19 +0100)]
fate: add dependencies for misc microsoft codecs
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 18 Oct 2012 02:12:54 +0000 (03:12 +0100)]
fate: add a dependency helper macro
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 18 Oct 2012 02:16:35 +0000 (03:16 +0100)]
fate-twinvq: add dependencies
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 18 Oct 2012 02:16:04 +0000 (03:16 +0100)]
fate-mpc: add dependencies
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 18 Oct 2012 02:15:26 +0000 (03:15 +0100)]
fate-indeo: add dependencies
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 18 Oct 2012 02:15:12 +0000 (03:15 +0100)]
fate-als: add dependencies
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 18 Oct 2012 01:25:58 +0000 (02:25 +0100)]
fate: dependencies for demux tests
Signed-off-by: Mans Rullgard <mans@mansr.com>
Martin Storsjö [Thu, 18 Oct 2012 08:53:19 +0000 (11:53 +0300)]
Add support for building shared libraries with MSVC
This requires the makedef perl script by Derek, from the
c89-to-c99 repo. That scripts produces a .def file, listing
the symbols to be exported, based on the gcc version scripts
and the built object files.
To properly load non-function symbols from DLL files, the
data symbol declarations need to have the attribute
__declspec(dllimport) when building the calling code. (On mingw,
the linker can fix this up automatically, which is why it has not
been an issue so far. If this attribute is omitted, linking
actually succeeds, but reads from the table will not produce the
desired results at runtime.)
MSVC seems to manage to link DLLs (and run properly) even if
this attribute is present while building the library itself
(which normally isn't recommended) - other object files in the
same library manage to link to the symbol (with a small warning
at link time, like "warning LNK4049: locally defined symbol
_avpriv_mpa_bitrate_tab imported" - it doesn't seem to be possible
to squelch this warning), and the definition of the tables
themselves produce a warning that can be squelched ("warning C4273:
'avpriv_mpa_bitrate_tab' : inconsistent dll linkage, see previous
definition of 'avpriv_mpa_bitrate_tab').
In this setup, mingw isn't able to link object files that refer to
data symbols with __declspec(dllimport) without those symbols
actually being linked via a DLL (linking avcodec.dll ends up with
errors like "undefined reference to `__imp__avpriv_mpa_freq_tab'").
The dllimport declspec isn't needed at all in mingw, so we simply
choose not to declare it for other compilers than MSVC that requires
it. (If ICL support later requires it, the condition can be extended
later to include both of them.)
This also implies that code that is built to link to a certain
library as a DLL can't link to the same library as a static library.
Therefore, we only allow building either static or shared but not
both at the same time. (That is, static libraries as such can be,
and actually are, built - this is used for linking the test tools to
internal symbols in the libraries - but e.g. libavformat built to
link to libavcodec as a DLL cannot link statically to libavcodec.)
Also, linking to DLLs is slightly different from linking to shared
libraries on other platforms. DLLs use a thing called import
libraries, which is basically a stub library allowing the linker
to know which symbols exist in the DLL and what name the DLL will
have at runtime.
In mingw/gcc, the import library is usually named libfoo.dll.a,
which goes next to a static library named libfoo.a. This allows
gcc to pick the dynamic one, if available, from the normal -lfoo
switches, just as it does for libfoo.a vs libfoo.so on Unix. On
MSVC however, you need to literally specify the name of the import
library instead of the static library.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 18 Oct 2012 07:30:03 +0000 (10:30 +0300)]
avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab
This table doesn't need to be shared with libavformat any longer.
Add mpeg12 to the name to make it less ambiguous, while renaming it.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 18 Oct 2012 07:23:12 +0000 (10:23 +0300)]
gxf: Add a local copy of the relevant parts of the frame rate table
This avoids having to share this table across the library
boundaries.
This shared table used to be problematic, if always declaring
all exported data symbols with the dllimport attribute (even
while building that same library), since it needs to be a
link-time constant when it is used in AVCodec declarations
(in mpeg12enc.c).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 13 Oct 2012 12:57:56 +0000 (15:57 +0300)]
configure: Split out msvc as a separate target OS
The name mingw32 as target OS is both misleading, and very little
of the target OS specific settings actually match.
Since the target OS default is set based on uname, the default
(which on MSYS is set to mingw) is overridden by --toolchain=msvc.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 18 Oct 2012 10:16:08 +0000 (12:16 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mips64: mark hi/lo registers clobbered in MAC64/MLS64 macros
fate: list lavfi tests in a makefile
Conflicts:
configure
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Oct 2012 09:42:42 +0000 (11:42 +0200)]
Merge commit '
36ac9a16a19a365ce58cc871484c20cffe9b6401'
* commit '
36ac9a16a19a365ce58cc871484c20cffe9b6401':
fate: dependencies for seek tests
fate: handle lavf test dependencies entirely in make
Conflicts:
configure
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Oct 2012 09:01:53 +0000 (11:01 +0200)]
fate: dependencies for ffmpeg vsynth tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Oct 2012 09:01:15 +0000 (11:01 +0200)]
fate: dependencies for ffmpeg acodec tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Oct 2012 08:29:17 +0000 (10:29 +0200)]
Merge commit '
292d1e78743855404c7d07e3e7cb3f9c9ae6275b'
* commit '
292d1e78743855404c7d07e3e7cb3f9c9ae6275b':
fate: dependencies for acodec tests
fate: dependencies for vsynth tests
fate: add macros useful for conditionally enabling things
libmp3lame: resize the output buffer if needed
Conflicts:
tests/fate/acodec.mak
tests/fate/vcodec.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 22:55:03 +0000 (00:55 +0200)]
cache: check lseek() return
Fixes CID717496
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 17 Oct 2012 20:00:54 +0000 (23:00 +0300)]
aviobuf: Remove a senseless ifdef in avio_seek
This seemed to assume that one never used writing avio unless
muxers or networking was enabled.
This ifdef is a remnant since
8fa641f8.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 17 Oct 2012 22:10:59 +0000 (00:10 +0200)]
cmdutils: add missing check for ftell() return
Fixed CID703706
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Wed, 17 Oct 2012 18:45:54 +0000 (19:45 +0100)]
mips64: mark hi/lo registers clobbered in MAC64/MLS64 macros
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Tue, 16 Oct 2012 13:20:57 +0000 (14:20 +0100)]
fate: dependencies for seek tests
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Tue, 16 Oct 2012 02:14:59 +0000 (03:14 +0100)]
fate: dependencies for acodec tests
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Tue, 16 Oct 2012 13:35:05 +0000 (14:35 +0100)]
fate: list lavfi tests in a makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Tue, 16 Oct 2012 13:06:41 +0000 (14:06 +0100)]
fate: handle lavf test dependencies entirely in make
This makes the lavf tests depend on all codecs and formats they use.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Tue, 16 Oct 2012 13:37:16 +0000 (14:37 +0100)]
fate: dependencies for vsynth tests
This makes the vsynth tests run only if the required codecs and
formats are enabled.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Tue, 16 Oct 2012 13:38:44 +0000 (14:38 +0100)]
fate: add macros useful for conditionally enabling things
Signed-off-by: Mans Rullgard <mans@mansr.com>
Alexis Ballier [Wed, 17 Oct 2012 18:52:11 +0000 (15:52 -0300)]
configure: do not quote arguments passed to filter{,_out} in check_ld.
This fixes the following error:
./configure: eval: line 417: syntax error near unexpected token `-lcdio_cdda'
[...]
Broken by
66a1ccd74 when doing, e.g., ./configure --enable-gpl --enable-libcdio.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 21:15:19 +0000 (23:15 +0200)]
cmdutils: remove unneeded null check
Fixes CID703769
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 3 Aug 2012 16:18:23 +0000 (18:18 +0200)]
examples/muxing: merge add_audio_stream() and add_video_stream()
Factorize.
Stefano Sabatini [Wed, 17 Oct 2012 09:08:53 +0000 (11:08 +0200)]
examples/muxing: check on frame
Fix crash in case frame is not defined (e.g. with muxing out.wav).
Stefano Sabatini [Wed, 17 Oct 2012 09:08:18 +0000 (11:08 +0200)]
examples/muxing: fix bogus setting of st->id
Stefano Sabatini [Wed, 17 Oct 2012 08:46:55 +0000 (10:46 +0200)]
examples/muxing: remove misleading comment about pending API change
The API was never changed since 2003. Replace with a comment about the
performed operation.
Stefano Sabatini [Wed, 17 Oct 2012 08:45:22 +0000 (10:45 +0200)]
examples/muxing: remove video_outbuf unused and useless code
Nicolas George [Wed, 17 Oct 2012 17:54:22 +0000 (19:54 +0200)]
lavfi/avf_concat: fix invalid exclusive test.
The invalid test did not cause any actual problem since
the first branch is only possible with bogus filters.
Fix coverity issue CID 733850.
Michael Niedermayer [Wed, 17 Oct 2012 18:58:08 +0000 (20:58 +0200)]
tiff: run strlen() after setting the pointer
Fixes CID733803
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 18:45:59 +0000 (20:45 +0200)]
ffmdec: check av_new_packet() return value
Fixes CID733711
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 18:36:30 +0000 (20:36 +0200)]
ffmdec: fix hypothetical overflows
Fixes CID703739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 18:24:47 +0000 (20:24 +0200)]
ffm_read_write_index: check lseek return code
Fixes CID732184
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 18:23:16 +0000 (20:23 +0200)]
ffm_write_write_index: check lseek() return code
Fixes CID732185
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 18:14:43 +0000 (20:14 +0200)]
ffm_seek: fix division by zero
Fixes CID732202
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 18:00:31 +0000 (20:00 +0200)]
libavfilter/lavfutils: remove useless NULL check on format context
Fixes: CID733804
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 17:55:13 +0000 (19:55 +0200)]
libavfilter/lavfutils: remove useless NULL check on codec context
The code would crash before if it was NULL
Fixes CID733804
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 15:20:12 +0000 (17:20 +0200)]
mov_probe: fix integer overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 17 Oct 2012 14:06:35 +0000 (14:06 +0000)]
idcinvideo: remove redundant " id CIN Video: " from av_log()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Justin Ruggles [Tue, 16 Oct 2012 18:07:04 +0000 (14:07 -0400)]
libmp3lame: resize the output buffer if needed
The LAME API documentation for the required buffer size refers to the size for
a single encode call. However, we store multiple frames in the same output
buffer but only read 1 frame at a time out of it. As a result, the buffer size
given in lame_encode_buffer() is actually smaller than what it should be.
Since we do not know how many frames it will end up buffering, it is best to
just reallocate if needed.
Michael Niedermayer [Wed, 17 Oct 2012 13:53:42 +0000 (15:53 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Add support for Tilera processors
wavdec: check size before reading the data, not after.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 13:50:45 +0000 (15:50 +0200)]
Merge commit '
79922d7237aba2b8c6abbd2e06a0c08e4f498ad4'
* commit '
79922d7237aba2b8c6abbd2e06a0c08e4f498ad4':
wav: do not fail on empty INFO tags
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 13:36:36 +0000 (15:36 +0200)]
Merge commit '
31c54711cc3f1484af101d629bbb805820d37ad1'
* commit '
31c54711cc3f1484af101d629bbb805820d37ad1':
lavf: split wav muxer and demuxer into separate files.
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 13:01:05 +0000 (15:01 +0200)]
Merge commit '
58b619c8a226cc4564ad5af291bc99a04f89ee56'
* commit '
58b619c8a226cc4564ad5af291bc99a04f89ee56':
wav muxer: write metadata
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 12:43:26 +0000 (14:43 +0200)]
Merge commit '
0bca0283ccded5e32da143a462168ad1988a58fd'
* commit '
0bca0283ccded5e32da143a462168ad1988a58fd':
riff: do not write empty INFO tags
Conflicts:
tests/ref/fate/vsynth1-cljr
tests/ref/fate/vsynth1-ffvhuff
tests/ref/fate/vsynth1-h261
tests/ref/fate/vsynth1-h263
tests/ref/fate/vsynth1-h263-obmc
tests/ref/fate/vsynth1-h263p
tests/ref/fate/vsynth1-huffyuv
tests/ref/fate/vsynth1-jpegls
tests/ref/fate/vsynth1-mjpeg
tests/ref/fate/vsynth1-mpeg4-adap
tests/ref/fate/vsynth1-mpeg4-adv
tests/ref/fate/vsynth1-mpeg4-error
tests/ref/fate/vsynth1-mpeg4-nr
tests/ref/fate/vsynth1-mpeg4-qpel
tests/ref/fate/vsynth1-mpeg4-qprd
tests/ref/fate/vsynth1-mpeg4-rc
tests/ref/fate/vsynth1-mpeg4-thread
tests/ref/fate/vsynth1-msmpeg4
tests/ref/fate/vsynth1-msmpeg4v2
tests/ref/fate/vsynth1-rgb
tests/ref/fate/vsynth1-wmv1
tests/ref/fate/vsynth1-wmv2
tests/ref/fate/vsynth1-yuv
tests/ref/fate/vsynth2-cljr
tests/ref/fate/vsynth2-ffvhuff
tests/ref/fate/vsynth2-h261
tests/ref/fate/vsynth2-h263
tests/ref/fate/vsynth2-h263-obmc
tests/ref/fate/vsynth2-h263p
tests/ref/fate/vsynth2-huffyuv
tests/ref/fate/vsynth2-jpegls
tests/ref/fate/vsynth2-mjpeg
tests/ref/fate/vsynth2-mpeg4-adap
tests/ref/fate/vsynth2-mpeg4-error
tests/ref/fate/vsynth2-mpeg4-nr
tests/ref/fate/vsynth2-mpeg4-qpel
tests/ref/fate/vsynth2-mpeg4-qprd
tests/ref/fate/vsynth2-mpeg4-rc
tests/ref/fate/vsynth2-mpeg4-thread
tests/ref/fate/vsynth2-msmpeg4
tests/ref/fate/vsynth2-msmpeg4v2
tests/ref/fate/vsynth2-rgb
tests/ref/fate/vsynth2-wmv1
tests/ref/fate/vsynth2-wmv2
tests/ref/fate/vsynth2-yuv
tests/ref/lavf/avi
tests/ref/seek/h261_avi
tests/ref/seek/h263_avi
tests/ref/seek/h263p_avi
tests/ref/seek/lavf_avi
tests/ref/seek/mjpeg_avi
tests/ref/seek/mpeg4_adap_avi
tests/ref/seek/mpeg4_error_avi
tests/ref/seek/mpeg4_nr_avi
tests/ref/seek/mpeg4_qpel_avi
tests/ref/seek/mpeg4_qprd_avi
tests/ref/seek/mpeg4_rc_avi
tests/ref/seek/mpeg4_thread_avi
tests/ref/seek/msmpeg4_avi
tests/ref/seek/msmpeg4v2_avi
tests/ref/seek/wmv1_avi
tests/ref/seek/wmv2_avi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 12:30:25 +0000 (14:30 +0200)]
Merge commit '
71e92414bfd79e56ea6fff174a665ff7b9b86e68'
* commit '
71e92414bfd79e56ea6fff174a665ff7b9b86e68':
lavf: move RIFF INFO tag writing from avienc to riff
avconv: fix disabling auto mappings with -map_metadata
Conflicts:
ffmpeg_opt.c
libavformat/riff.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 12:17:55 +0000 (14:17 +0200)]
Merge commit '
a25d912dca9cd553440167e0476c47581359c0fc'
* commit '
a25d912dca9cd553440167e0476c47581359c0fc':
avcodec_encode_audio(): fix invalid free
pcm-mpeg: correct bitrate calculation
ffv1: K&R formatting cosmetics
fate: Add rangecoder test
network: #include stdint.h in network.h
nut: export codec_tag provided by rawvideo
avserver: move avserver-specific code from ffmdec.c to avserver.c
Conflicts:
ffserver.c
libavcodec/ffv1.c
libavformat/ffmdec.c
libavformat/nutenc.c
tests/ref/lavfi/crop
tests/ref/lavfi/crop_scale
tests/ref/lavfi/crop_scale_vflip
tests/ref/lavfi/crop_vflip
tests/ref/lavfi/null
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_crop
tests/ref/lavfi/pixfmts_hflip
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_pad
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
tests/ref/lavfi/scale200
tests/ref/lavfi/scale500
tests/ref/lavfi/vflip
tests/ref/lavfi/vflip_crop
tests/ref/lavfi/vflip_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 17 Oct 2012 12:10:42 +0000 (12:10 +0000)]
lavc/tta: use meaningful error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 17 Oct 2012 09:12:18 +0000 (09:12 +0000)]
tta: datalen is unsigned integer per reference library
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 16 Oct 2012 20:10:35 +0000 (22:10 +0200)]
sws-test: parse command line args before initing contexts
This fixes parsing comand line args after ref
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 12 Oct 2012 21:20:31 +0000 (23:20 +0200)]
lavf/swfdec: support DefineBitsLossless{,2} tag.
Michael Niedermayer [Wed, 17 Oct 2012 01:19:11 +0000 (03:19 +0200)]
ffv1: fix packed rgb with 1.3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 00:48:30 +0000 (02:48 +0200)]
mov: fix time types related to mov_metadata_creation_time
Fixes Ticket1817
Based on patch by: Przemyslaw Wesolek <przemyslaw.wesolek@go.art.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Oct 2012 00:32:43 +0000 (02:32 +0200)]
examples/muxing: fix video pts
Fixes Ticket1801
Based on suggestion from AztecC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Tue, 16 Oct 2012 18:21:06 +0000 (18:21 +0000)]
configure: Add support for Tilera processors
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Tue, 16 Oct 2012 21:58:26 +0000 (23:58 +0200)]
lavfi: limit matching w/h/fmt asserts to non scale filters
This fixes a regression with the scale filters input changing.
In the long run filters should get a flag to indicate support of this
and then this flag be used here.
But the regression should not be left standing until thats done.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 16 Oct 2012 21:52:53 +0000 (23:52 +0200)]
libavfilter/buffersrc: Do not fail hard on changes of input parameters.
Several filters support this already.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>