OSDN Git Service
Michael Niedermayer [Wed, 8 Aug 2012 23:40:56 +0000 (01:40 +0200)]
integer: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Aug 2012 23:40:31 +0000 (01:40 +0200)]
integer: fix typos in asserts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Wed, 8 Aug 2012 11:44:11 +0000 (13:44 +0200)]
lavfi: add asetpts audio filter
Based on an idea by Andrey Utkin <andrey.krieger.utkin@gmail.com>.
Michael Niedermayer [Wed, 8 Aug 2012 22:26:38 +0000 (00:26 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits)
build: cosmetics: Reorder some lists in a more logical fashion
x86: pngdsp: Fix assembly for OS/2
fate: add test for RTjpeg in nuv with frameheader
rtmp: send check_bw as notification
g723_1: clip argument for 15-bit version of normalize_bits()
g723_1: use all LPC vectors in formant postfilter
id3v2: Support v2.2 PIC
avplay: fix build with lavfi disabled.
avconv: split configuring filter configuration to a separate file.
avconv: split option parsing into a separate file.
mpc8: do not leave padding after last frame in buffer for the next decode call
mpegaudioenc: list supported channel layouts.
mpegaudiodec: don't print an error on > 1 frame in a packet.
api-example: update to new audio encoding API.
configure: add --enable/disable-random option
doc: cygwin: Update list of FATE package requirements
build: Remove all installed headers and header directories on uninstall
build: change checkheaders to use regular build rules
rtmp: Add a new option 'rtmp_subscribe'
rtmp: Add support for subscribing live streams
...
Conflicts:
Makefile
common.mak
configure
doc/examples/decoding_encoding.c
ffmpeg.c
libavcodec/g723_1.c
libavcodec/mpegaudiodec.c
libavcodec/x86/pngdsp.asm
libavformat/version.h
library.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Wed, 8 Aug 2012 09:19:14 +0000 (11:19 +0200)]
lavd/x11grab: deprecate "nomouse" specification in filename
Favor draw_mouse option. Should simplify parsing, and make it more
robust.
Stefano Sabatini [Wed, 8 Aug 2012 08:25:25 +0000 (10:25 +0200)]
doc/indevs: document missing options in x11grab section
Add documentation for options draw_mouse, framerate, and video_size.
In particular, fix trac ticket #1314.
Stefano Sabatini [Wed, 8 Aug 2012 08:21:41 +0000 (10:21 +0200)]
lavd/x11grab: apply misc consistency fixes to options definition
In particular, do not upcase first word, do not use final dot, use a verb
to specify what the option does, sort entries by name, apply random
vertical align.
Stefano Sabatini [Wed, 8 Aug 2012 08:18:38 +0000 (10:18 +0200)]
doc/indevs: use separate @example blocks for separate examples
Improve rendering.
Stefano Sabatini [Wed, 8 Aug 2012 08:16:26 +0000 (10:16 +0200)]
doc/indevs: rework options description in the x11 grab section
Create a dedicated options subchapter, rather than a subchapter for each
option.
This is more consistent with the rest of the docs. Also apply misc minor
fixes for improving rendering.
Stefano Sabatini [Tue, 7 Aug 2012 19:11:51 +0000 (21:11 +0200)]
doc/ffmpeg: do not show examples making use of the deprecated glob_sequence pattern type
The syntax of the 'glob_sequence' pattern type is explained in the image2
manual section, so there is no need to replicate it here.
Also discourage the use of such deprecated pattern type by not showing
examples employing it.
Replace the syntax explanation with an use example of the 'glob' pattern
type.
Stefano Sabatini [Mon, 6 Aug 2012 12:54:06 +0000 (14:54 +0200)]
lavf/img2dec: add and document pattern_type option
Allow to override the default 'glob_sequence' value, which is deprecated
in favor of the new 'glob' and 'sequence' options.
The new pattern types should be easier on the user since they are more
predictable than 'glob_sequence', and do not require awkward escaping.
Stefano Sabatini [Sat, 4 Aug 2012 16:33:19 +0000 (18:33 +0200)]
doc/demuxers: itemize image2 examples and put them in a dedicated subsection
Clément Bœsch [Wed, 8 Aug 2012 21:10:17 +0000 (23:10 +0200)]
lavf/movenc: use two explicit bytes instead of a short.
This also avoids a pointless cast.
Idea-by: Reimar Döffinger
Clément Bœsch [Sun, 5 Aug 2012 19:10:11 +0000 (21:10 +0200)]
lavfi/atempo: remove dead increment.
Michael Niedermayer [Wed, 8 Aug 2012 19:13:15 +0000 (21:13 +0200)]
lavf: block special characters in dump metadata
This is limited to the chars that arent filtered by av_log() already
we might filter more aggressively if theres some case where this becomes
needed.
Fixes Ticket1181
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Aug 2012 15:53:41 +0000 (17:53 +0200)]
matroskadec: fix lace vs block duration.
Fixes Ticket1270
Thanks-to: Moritz Bunkus
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Wed, 8 Aug 2012 14:42:36 +0000 (16:42 +0200)]
lavfi/testsrc: set default value for option "color" to NULL and rework color setting logic
Fix bogus warnings of the kind:
option 'color' is ignored with source 'testsrc'
when the color value is not explicitely set and the filter is different
from "color".
Michael Niedermayer [Wed, 8 Aug 2012 14:01:01 +0000 (16:01 +0200)]
configure: fix sctp check.
This fixes build failures on debian/kfreebsd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 7 Aug 2012 23:31:55 +0000 (23:31 +0000)]
doc/general: move ZeroCodec to right section
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diego Biurrun [Wed, 8 Aug 2012 00:41:57 +0000 (02:41 +0200)]
build: cosmetics: Reorder some lists in a more logical fashion
Dave Yeo [Wed, 8 Aug 2012 04:46:33 +0000 (21:46 -0700)]
x86: pngdsp: Fix assembly for OS/2
The a.out object format does not allow aligning sections.
On OS/2 LD aligns sections to 16 bytes.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Janne Grunau [Mon, 6 Aug 2012 17:43:36 +0000 (19:43 +0200)]
fate: add test for RTjpeg in nuv with frameheader
Renames the old test to allow using fate-nuv as group for all
nuv tests.
Luca Barbato [Wed, 8 Aug 2012 09:49:02 +0000 (11:49 +0200)]
rtmp: send check_bw as notification
Set the transactionId to 0 to signal the server a return _result/_error
is not expected.
Solves the problems experienced with strict rtmp servers.
Kostya Shishkov [Tue, 7 Aug 2012 17:32:20 +0000 (19:32 +0200)]
g723_1: clip argument for 15-bit version of normalize_bits()
It expects maximum value to be 32767 but calculations in scale_vector()
which uses this function can give it ABS(-32768) which leads to wrong
result and thus clipping is needed.
Kostya Shishkov [Mon, 6 Aug 2012 18:25:16 +0000 (20:25 +0200)]
g723_1: use all LPC vectors in formant postfilter
Due to some mistake LPC vector for the first subframe was used for all
subframes instead of their own LPC vectors.
Mohammad Alsaleh [Tue, 7 Aug 2012 21:31:51 +0000 (21:31 +0000)]
id3v2: Support v2.2 PIC
id3 v2.2 uses image format ("JPG","PNG") instead of mimetypes.
Currently, the attached picture is skipped because the format string
does not match a known picture mimetype.
This patch fixes this behaviour.
Signed-off-by: Mohammad Alsaleh <msal@tormail.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Konstantin Pavlov [Wed, 8 Aug 2012 08:30:47 +0000 (12:30 +0400)]
avplay: fix build with lavfi disabled.
Issue introduced in
67339f6e.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Thu, 2 Aug 2012 06:24:02 +0000 (08:24 +0200)]
avconv: split configuring filter configuration to a separate file.
Anton Khirnov [Wed, 1 Aug 2012 16:23:12 +0000 (18:23 +0200)]
avconv: split option parsing into a separate file.
Kostya Shishkov [Tue, 7 Aug 2012 18:22:57 +0000 (20:22 +0200)]
mpc8: do not leave padding after last frame in buffer for the next decode call
Clément Bœsch [Fri, 3 Aug 2012 13:40:48 +0000 (15:40 +0200)]
lavf/movenc: add frame rate heuristic for timecode frame rate.
Fixes ticket 1576.
Clément Bœsch [Fri, 3 Aug 2012 13:40:15 +0000 (15:40 +0200)]
lavu/timecode: add av_timecode_check_frame_rate().
Clément Bœsch [Fri, 3 Aug 2012 08:20:44 +0000 (10:20 +0200)]
lavf/mxfenc: better error handling with invalid frame rate.
Clément Bœsch [Fri, 3 Aug 2012 08:21:24 +0000 (10:21 +0200)]
lavf/mxfenc: simplify frame rate checks.
jamal [Wed, 8 Aug 2012 06:02:56 +0000 (08:02 +0200)]
lavc/old_codec_ids: Fix make checkheaders.
Anton Khirnov [Wed, 1 Aug 2012 05:33:56 +0000 (07:33 +0200)]
mpegaudioenc: list supported channel layouts.
Anton Khirnov [Tue, 31 Jul 2012 13:44:00 +0000 (15:44 +0200)]
mpegaudiodec: don't print an error on > 1 frame in a packet.
It's a perfectly normal situation, nothing to spam about.
Anton Khirnov [Tue, 31 Jul 2012 13:32:02 +0000 (15:32 +0200)]
api-example: update to new audio encoding API.
Michael Niedermayer [Tue, 7 Aug 2012 23:06:22 +0000 (01:06 +0200)]
cavs: fix memleak
Fixes Ticket1335
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Aug 2012 22:55:11 +0000 (00:55 +0200)]
x86inc.asm: remove redundant ifdef __YASM_VER__
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 7 Aug 2012 22:56:35 +0000 (22:56 +0000)]
libtwolame: fix stupid bug
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 7 Aug 2012 21:57:21 +0000 (23:57 +0200)]
rename missed CodecID to AVCodecID
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Wed, 9 May 2012 03:29:53 +0000 (04:29 +0100)]
configure: add --enable/disable-random option
This allows creating random configurations which is useful for
testing purposes.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Tue, 7 Aug 2012 21:04:55 +0000 (23:04 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: fix build with nasm 2.08
x86: use nop cpu directives only if supported
x86: fix rNmp macros with nasm
build: add trailing / to yasm/nasm -I flags
x86: use 32-bit source registers with movd instruction
x86: add colons after labels
Conflicts:
Makefile
libavutil/x86/x86inc.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 7 Aug 2012 03:55:28 +0000 (03:55 +0000)]
gifdec: return more meaningful error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 7 Aug 2012 03:46:33 +0000 (03:46 +0000)]
gifdec: remove redundant "gif: " from av_dlog()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 7 Aug 2012 03:43:55 +0000 (03:43 +0000)]
gifdec: pass avctx to av_log()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diego Biurrun [Tue, 7 Aug 2012 12:56:38 +0000 (14:56 +0200)]
doc: cygwin: Update list of FATE package requirements
Diego Biurrun [Tue, 7 Aug 2012 15:05:34 +0000 (17:05 +0200)]
build: Remove all installed headers and header directories on uninstall
Michael Niedermayer [Tue, 7 Aug 2012 20:45:46 +0000 (22:45 +0200)]
Merge commit '
36ef5369ee9b336febc2c270f8718cec4476cb85'
* commit '
36ef5369ee9b336febc2c270f8718cec4476cb85':
Replace all CODEC_ID_* with AV_CODEC_ID_*
lavc: add AV prefix to codec ids.
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
ffprobe.c
ffserver.c
libavcodec/8svx.c
libavcodec/avcodec.h
libavcodec/dnxhd_parser.c
libavcodec/dvdsubdec.c
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/libvorbisenc.c
libavcodec/mjpeg_parser.c
libavcodec/mjpegenc.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/pcm.c
libavcodec/r210dec.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/version.h
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/v4l2.c
libavformat/asfdec.c
libavformat/asfenc.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/caf.c
libavformat/electronicarts.c
libavformat/flacdec.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/framecrcenc.c
libavformat/img2.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/matroska.c
libavformat/matroskadec.c
libavformat/matroskaenc.c
libavformat/mov.c
libavformat/movenc.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegts.c
libavformat/mxf.c
libavformat/mxfdec.c
libavformat/mxfenc.c
libavformat/nsvdec.c
libavformat/nut.c
libavformat/oggenc.c
libavformat/pmpdec.c
libavformat/rawdec.c
libavformat/rawenc.c
libavformat/riff.c
libavformat/sdp.c
libavformat/utils.c
libavformat/vocenc.c
libavformat/wtv.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Tue, 7 Aug 2012 01:11:25 +0000 (02:11 +0100)]
build: change checkheaders to use regular build rules
Many compilers need special flags to compile *.h files as regular
source code, if they will do so at all. Rather than hoping all
compilers will have such a flag and adding mappings for it, create
wrapper .c files for test building single headers.
This allows using the regular rule for compiling C files without the
need for special flags, and it also provides proper dependency tracking
for these objects.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Samuel Pitoiset [Tue, 7 Aug 2012 20:02:27 +0000 (22:02 +0200)]
rtmp: Add a new option 'rtmp_subscribe'
This option specifies the name of live stream to subscribe.
Defaults to rtmp_playpath.
Signed-off-by: Martin Storsjö <martin@martin.st>
Samuel Pitoiset [Tue, 7 Aug 2012 19:51:46 +0000 (21:51 +0200)]
rtmp: Add support for subscribing live streams
When streaming live streams using the Akamai, Edgecast or Limelight CDN,
players cannot simply connect to the live stream. Instead, they have to
subscribe to it, by sending an FC Subscribe call to the server.
Signed-off-by: Martin Storsjö <martin@martin.st>
Samuel Pitoiset [Tue, 7 Aug 2012 10:21:31 +0000 (12:21 +0200)]
rtmp: Factorize simultaneous URLProtocol / AVClass declarations with a macro
Signed-off-by: Martin Storsjö <martin@martin.st>
jamal [Fri, 3 Aug 2012 20:13:27 +0000 (17:13 -0300)]
build: Fix some paths in uninstall-libs
Folder and file names weren't being separated with a slash.
This resulted in .dll.a, .lib and .def files not being removed on uninstall.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
jamal [Sun, 15 Jul 2012 20:30:40 +0000 (17:30 -0300)]
checkheaders: Fix directory creation in out-of-tree builds.
checkheaders wasn't creating folders as needed, so if it was run
immediately after the configure script it would fail as soon as
it tried to compile headers inside the ARCH folders.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Mans Rullgard [Tue, 7 Aug 2012 16:43:29 +0000 (17:43 +0100)]
ARM: use Q/R inline asm operand modifiers only if supported
Some compilers do not support the Q/R modifiers used to access
the low/high parts of a 64-bit register pair. Check for this
and disable all uses of it when not supported.
Fixes bug #337.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Tue, 7 Aug 2012 19:49:00 +0000 (21:49 +0200)]
Merge commit '
f5d2c597e99af218b0d4d1cf9737c7e68ee934e4'
* commit '
f5d2c597e99af218b0d4d1cf9737c7e68ee934e4':
build: fix library installation on cygwin
mpc8: add a flush function
mpc8: set packet duration and stream start time instead of tracking frames
Conflicts:
libavformat/mpc8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Aug 2012 18:58:25 +0000 (20:58 +0200)]
pnmdec: make ff_pnm_decode_header() more robust
Fixes ticket1321
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Aug 2012 18:57:40 +0000 (20:57 +0200)]
pnmdec: make pnm_get more robust
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Tue, 7 Aug 2012 16:52:16 +0000 (12:52 -0400)]
configure: Add support for e500mc CPU
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 20 Jun 2012 01:54:58 +0000 (01:54 +0000)]
lavfi: add smptebars source
Patch readapted by Stefano Sabatini, color values proposed by Tim
Nicholson <nichot20@yahoo.com>.
Address trac ticket #1462.
See thread:
Subject: [FFmpeg-devel] [PATCH] smptebars filter
Date: Wed, 20 Jun 2012 01:54:58 +0000
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Fri, 3 Aug 2012 15:57:45 +0000 (17:57 +0200)]
examples/muxing: set codec in the codec context
Make add_{audio,video}_stream return the found codec, and pass it to
avcodec_open2() through open_{audio,video} functions.
Fix failure:
No codec provided to avcodec_open2().
could not open codec
This is also consistent with the use of the avcodec_open2() API in the
codebase.
Michael Niedermayer [Tue, 7 Aug 2012 17:18:53 +0000 (19:18 +0200)]
avidec: fix AVStream.info memleak with dv.
Fixes Ticket1334
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Tue, 7 Aug 2012 16:49:01 +0000 (12:49 -0400)]
configure: Add support for e500mc CPU
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Tue, 7 Aug 2012 15:59:19 +0000 (17:59 +0200)]
mpeg12dec: move checks out of decode picture coding extension.
Fixes out of array reads
Fixes Ticket1330
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Mon, 6 Aug 2012 01:26:15 +0000 (02:26 +0100)]
x86: fix build with nasm 2.08
It appears that something goes wrong in old nasm versions when the
%+ operator is used in the last argument of a macro invocation and
this argument is tested with %ifdef within the macro. This patch
rearranges the macro arguments such that the %+ operator is never
used in the last argument.
Mans Rullgard [Sun, 5 Aug 2012 23:34:51 +0000 (00:34 +0100)]
x86: use nop cpu directives only if supported
nasm does not support 'CPU foonop' directives. This adds a configure
test for the directive and uses it only if supported.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 5 Aug 2012 23:21:36 +0000 (00:21 +0100)]
x86: fix rNmp macros with nasm
For some reason, nasm requires this. No harm done to yasm.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 5 Aug 2012 23:17:40 +0000 (00:17 +0100)]
build: add trailing / to yasm/nasm -I flags
nasm requires a trailing / on paths specified with -I.
It does no harm with yasm.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 5 Aug 2012 23:16:13 +0000 (00:16 +0100)]
x86: use 32-bit source registers with movd instruction
yasm tolerates mismatch between movd/movq and source register size,
adjusting the instruction according to the register. nasm is more
strict.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 5 Aug 2012 23:09:48 +0000 (00:09 +0100)]
x86: add colons after labels
nasm prints a warning if the colon is missing.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Anton Khirnov [Sun, 5 Aug 2012 09:11:04 +0000 (11:11 +0200)]
Replace all CODEC_ID_* with AV_CODEC_ID_*
Anton Khirnov [Sun, 5 Aug 2012 08:36:55 +0000 (10:36 +0200)]
lavc: add AV prefix to codec ids.
Yaakov Selkowitz [Mon, 6 Aug 2012 23:32:48 +0000 (00:32 +0100)]
build: fix library installation on cygwin
This installs libraries using the proper names and locations,
generates an import lib for the DLL, and drops no longer needed
linker flags.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Tue, 7 Aug 2012 11:26:40 +0000 (13:26 +0200)]
arm: fix compile with disable-optimizations on android
Fixes Ticket1241
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 7 Aug 2012 05:37:37 +0000 (07:37 +0200)]
doc: fix misspelled "convergence".
Found-by: David Rice
Paul B Mahol [Sun, 5 Aug 2012 23:46:41 +0000 (23:46 +0000)]
avcodec: add bmp parser
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 7 Aug 2012 02:38:44 +0000 (04:38 +0200)]
mpegaudiodec: replace assert() by check under #ifdef DEBUG
The assert can be false with some invalid inputs, the check is
too expensive to always do though for just a warning message.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Aug 2012 23:11:28 +0000 (01:11 +0200)]
proresenc_kostya: do not attempt to free random things
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Aug 2012 22:18:59 +0000 (00:18 +0200)]
h264: disable assert on current_picture_ptr being null.
It is possible in various error pathes as well as gap handling
that this has already been allocated. Its not clear why that
would be a problem with the current code, thus disable the
assert to avoid common assert failure when asserts are enabled.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Aug 2012 20:14:43 +0000 (22:14 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
nuv: K&R formatting cosmetics
build: generalise rules and variable settings for av* programs
nuv: check RTjpeg header for validity
Revert "nuv: check per-frame header for validity."
imc: remove unused field IMCContext.one_div_log2
imc: fix size of a memset()
imc: remove empty if() block
fate: simplify variable setting filter.mak
lavf: Declare an AVRational struct without a struct literal
Conflicts:
Makefile
configure
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Aug 2012 19:07:23 +0000 (21:07 +0200)]
avidec: parse INFO tags at the end
Fixes Ticket1123
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Mon, 6 Aug 2012 17:06:25 +0000 (13:06 -0400)]
mpc8: add a flush function
Ensures that the next frame decoded after seeking will be decoded as a
keyframe.
Justin Ruggles [Mon, 6 Aug 2012 16:38:57 +0000 (12:38 -0400)]
mpc8: set packet duration and stream start time instead of tracking frames
Fixes mpc8 timestamps.
Michael Niedermayer [Mon, 6 Aug 2012 17:34:09 +0000 (19:34 +0200)]
msrle: fix extradata palette handling
Fixes Ticket1273
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 6 Aug 2012 13:49:51 +0000 (15:49 +0200)]
nuv: K&R formatting cosmetics
Mans Rullgard [Sat, 4 Aug 2012 18:04:08 +0000 (19:04 +0100)]
build: generalise rules and variable settings for av* programs
This simplifies adding extra flags for individual programs
and also allows more than one object file per program.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Nicolas George [Tue, 24 Jul 2012 13:13:02 +0000 (15:13 +0200)]
ffprobe: refactor frames decoding.
Michael Niedermayer [Mon, 6 Aug 2012 14:49:49 +0000 (16:49 +0200)]
mpegvideo: remove last_picture_ptr / h264 assert.
This assert is no longer true since h264 error concealment needs
last_picture_ptr to be set.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Aug 2012 14:40:22 +0000 (16:40 +0200)]
mpegvideo.c: convert some asserts to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Aug 2012 14:28:13 +0000 (16:28 +0200)]
svq1enc: set picture_structure correctly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Aug 2012 12:39:40 +0000 (14:39 +0200)]
mpegvideo_enc: switch some assert to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Aug 2012 08:26:04 +0000 (10:26 +0200)]
mpegvideo_enc: remove assert that has become obsolete with the new API
it now just checks uninitialized and unused data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Mon, 6 Aug 2012 11:59:04 +0000 (13:59 +0200)]
nuv: check RTjpeg header for validity
CC: libav-stable@libav.org
Janne Grunau [Mon, 6 Aug 2012 11:50:51 +0000 (13:50 +0200)]
Revert "nuv: check per-frame header for validity."
The check is bogus since the nuv frameheader is already skipped
and the (decompressed) RTjpeg header is checked.
This reverts commit
f6afacdb3b708720c9fb85984b4f7fdbca2b2036.
CC: libav-stable@libav.org
Mans Rullgard [Sun, 5 Aug 2012 21:36:09 +0000 (22:36 +0100)]
imc: remove unused field IMCContext.one_div_log2
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 5 Aug 2012 21:32:20 +0000 (22:32 +0100)]
imc: fix size of a memset()
IMCContext was changed from an array to a pointer in
66b84e4,
but this memset() was not updated.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 5 Aug 2012 17:32:03 +0000 (18:32 +0100)]
imc: remove empty if() block
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 5 Aug 2012 11:06:19 +0000 (12:06 +0100)]
fate: simplify variable setting filter.mak
This removes some needless indirection and duplication.
Signed-off-by: Mans Rullgard <mans@mansr.com>