ffmpeg.git
6 years agoffmpeg: Do not discard slightly invalid timestamps.
Michael Niedermayer [Sat, 11 Aug 2012 21:38:48 +0000 (23:38 +0200)]
ffmpeg: Do not discard slightly invalid timestamps.

Fixes Ticket1627

The fate change is due to ffmpeg no longer pushing audio timestamps
aggressively up (which is what caused the AV sync issues in the ticket)
but leaving them as they are.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dec: support debug & FF_DEBUG_PICT_INFO.
Michael Niedermayer [Sat, 11 Aug 2012 22:27:57 +0000 (00:27 +0200)]
vc1dec: support debug & FF_DEBUG_PICT_INFO.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: do not discard correct dts in favor of wrong pts for vc1-wmapro.ism
Michael Niedermayer [Sat, 11 Aug 2012 22:48:49 +0000 (00:48 +0200)]
lavf: do not discard correct dts in favor of wrong pts for vc1-wmapro.ism

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomov: add av_dlog() to CTTS reading code like is already done in STTS.
Michael Niedermayer [Sat, 11 Aug 2012 21:27:27 +0000 (23:27 +0200)]
mov: add av_dlog() to CTTS reading code like is already done in STTS.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoasfdec: fix FRAME_HEADER_SIZE
Michael Niedermayer [Sat, 11 Aug 2012 17:44:33 +0000 (19:44 +0200)]
asfdec: fix FRAME_HEADER_SIZE

Fixes Ticket1477

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodsputil_template: switch to av_assert
Michael Niedermayer [Sat, 11 Aug 2012 14:58:18 +0000 (16:58 +0200)]
dsputil_template: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 11 Aug 2012 12:50:54 +0000 (14:50 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: simplify is_intra_only() by using codec descriptors.
  lavc: add an intra-only codec property.
  lavc: add codec descriptors.
  lavc: fix mixing CODEC_ID/AV_CODEC_ID in C++ code.
  dict: move struct AVDictionary definition to dict.c
  dict: add av_dict_count()

Conflicts:
doc/APIchanges
libavcodec/old_codec_ids.h
libavformat/utils.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: simplify is_intra_only() by using codec descriptors.
Anton Khirnov [Thu, 9 Aug 2012 16:39:56 +0000 (18:39 +0200)]
lavf: simplify is_intra_only() by using codec descriptors.

6 years agolavc: add an intra-only codec property.
Anton Khirnov [Thu, 9 Aug 2012 16:34:10 +0000 (18:34 +0200)]
lavc: add an intra-only codec property.

6 years agolavc: add codec descriptors.
Anton Khirnov [Sun, 5 Aug 2012 13:18:00 +0000 (15:18 +0200)]
lavc: add codec descriptors.

They describe properties that are inherent to a codec (as described by
an AVCodecID) without referring to a specific implementation.

6 years agosnowdec: increase stack size
Michael Niedermayer [Sat, 11 Aug 2012 03:32:16 +0000 (05:32 +0200)]
snowdec: increase stack size

Fixes Ticket1632

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodwt: switch to av_assert
Michael Niedermayer [Sat, 11 Aug 2012 01:32:51 +0000 (03:32 +0200)]
dwt: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomsrle: fix regression causing null ptr dereference
Michael Niedermayer [Sat, 11 Aug 2012 00:20:06 +0000 (02:20 +0200)]
msrle: fix regression causing null ptr dereference

Fixes Ticket1630

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocavsdec: check dimensions being valid.
Michael Niedermayer [Sat, 11 Aug 2012 00:00:33 +0000 (02:00 +0200)]
cavsdec: check dimensions being valid.

Fixes crash
Fixes Ticket1628

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomp3enc: fix CODEC_ID/CodecID that leaked in from older patch
Michael Niedermayer [Fri, 10 Aug 2012 23:25:19 +0000 (01:25 +0200)]
mp3enc: fix CODEC_ID/CodecID that leaked in from older patch

Found-by: jamal <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/Makefile: invoke perl to interpret texi2pod.pl
Stefano Sabatini [Fri, 10 Aug 2012 09:49:27 +0000 (11:49 +0200)]
doc/Makefile: invoke perl to interpret texi2pod.pl

Do not rely on shebang directive in the script, whose exact behavior is
system dependent.

6 years agocmdutils: show options in show_help_children only if the context has options
Stefano Sabatini [Thu, 9 Aug 2012 12:44:18 +0000 (14:44 +0200)]
cmdutils: show options in show_help_children only if the context has options

Avoid to print a pointless name of the context followed by an empty list.

6 years agolavu/opt: fix crash in av_opt_next() in case the class has no options
Stefano Sabatini [Thu, 9 Aug 2012 09:50:58 +0000 (11:50 +0200)]
lavu/opt: fix crash in av_opt_next() in case the class has no options

6 years agolavc: fix mixing CODEC_ID/AV_CODEC_ID in C++ code.
Anton Khirnov [Wed, 8 Aug 2012 06:04:56 +0000 (08:04 +0200)]
lavc: fix mixing CODEC_ID/AV_CODEC_ID in C++ code.

C++ does not allow to mix different enums, so e.g. code comparing
ACodecID with CodecID would fail to compile with gcc.

This very evil hack should fix this problem.

6 years agomp3/mp2: identify the video codecs as APIC through query_codec.
Michael Niedermayer [Sat, 4 Aug 2012 17:00:44 +0000 (19:00 +0200)]
mp3/mp2: identify the video codecs as APIC through query_codec.

Fixes Ticket1408

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: dont auto match videostreams with attachment pics.
Michael Niedermayer [Sat, 4 Aug 2012 17:00:11 +0000 (19:00 +0200)]
ffmpeg: dont auto match videostreams with attachment pics.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: return APIC fourcc from query_format() if the codec is supported as an attachme...
Michael Niedermayer [Sat, 4 Aug 2012 16:59:03 +0000 (18:59 +0200)]
lavf: return APIC fourcc from query_format() if the codec is supported as an attachment pic

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoiff: replace av_abort by av_assert0
Michael Niedermayer [Fri, 10 Aug 2012 14:26:39 +0000 (16:26 +0200)]
iff: replace av_abort by av_assert0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 10 Aug 2012 14:19:23 +0000 (16:19 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  g723.1: fix addition overflow
  g723.1: simplify and fix multiplication overflow
  g723.1: deobfuscate an expression
  g723.1: remove unused #includes
  ARM: add missing "cc" clobber in av_clipl_int32_arm()
  rtmp: Factorize the code by adding handle_invoke_error
  rtmp: Factorize the code by adding handle_invoke_status
  rtmp: Factorize the code by adding handle_invoke_result
  libavutil: remove unused av_abort() macro
  ffmenc: replace if/abort with assert()
  libavutil: drop offsetof() fallback definition
  libavutil: drop fallback definitions of INTxx_MIN/MAX
  configure: Check for a sctp struct instead of just the header
  configure: suncc: Add -xc99 to dependency flags, required on Solaris
  doxygen: Fix function parameter names to match the code
  doc: Drop obsolete shared libs cflags hint to workaround Cygwin gcc bugs
  swf: Move shared table out of the header file
  swf: Move swf_audio_codec_tags table to the only place it is used
  fate: add G.723.1 decoder tests

Conflicts:
configure
doc/platform.texi
libavformat/Makefile
libavutil/arm/intmath.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodict: move struct AVDictionary definition to dict.c
Mans Rullgard [Wed, 8 Aug 2012 16:31:44 +0000 (17:31 +0100)]
dict: move struct AVDictionary definition to dict.c

This makes struct AVDictionary fully opaque now that nothing
needs to access it directly any more.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodict: add av_dict_count()
Mans Rullgard [Wed, 8 Aug 2012 16:30:15 +0000 (17:30 +0100)]
dict: add av_dict_count()

This adds a function to retrieve the number of entries in a
dictionary and updates the places directly accessing what should
be an opaque struct to use this new function instead.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agomjpegdec: support AVRn interlaced
Michael Niedermayer [Fri, 10 Aug 2012 13:47:07 +0000 (15:47 +0200)]
mjpegdec: support AVRn interlaced

Fixes Ticket1527
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agog723.1: fix addition overflow
Mans Rullgard [Fri, 10 Aug 2012 00:17:20 +0000 (01:17 +0100)]
g723.1: fix addition overflow

This addition must be done as 64-bit to avoid overflow and for
the subsequent clipping to be meaningful.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agog723.1: simplify and fix multiplication overflow
Mans Rullgard [Fri, 10 Aug 2012 00:14:32 +0000 (01:14 +0100)]
g723.1: simplify and fix multiplication overflow

In 16-bit arithmetic, x * 0xffffc is simply x * -4 with extra overflows,
(and the constant was probably meant to be 0xfffc).  Combined with the
shift, this simplifies to -x >> 1.  Finally, clearing the low two bits
with a 32-bit mask and switching to a 32-bit type allows more efficient
code on 32-bit machines.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agog723.1: deobfuscate an expression
Mans Rullgard [Thu, 9 Aug 2012 23:13:46 +0000 (00:13 +0100)]
g723.1: deobfuscate an expression

(x << 2) - x is just an optimisation of 3 * x the compiler is
perfectly capable of doing on its own.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agog723.1: remove unused #includes
Mans Rullgard [Thu, 9 Aug 2012 20:02:46 +0000 (21:02 +0100)]
g723.1: remove unused #includes

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoARM: add missing "cc" clobber in av_clipl_int32_arm()
Mans Rullgard [Thu, 9 Aug 2012 21:45:51 +0000 (22:45 +0100)]
ARM: add missing "cc" clobber in av_clipl_int32_arm()

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 10 Aug 2012 02:46:13 +0000 (04:46 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  motion_est: drop inline from sad_hpel_motion_search()
  motion_est: remove unused macros
  motion_est: remove useless no_motion_search() function
  lagarith: frame multithreading
  doxygen: qdm2: Drop documentation for non-existing function parameters
  build: add HOSTOBJS to SUBDIR_VARS list

Conflicts:
Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: Allocate new buffer for bitstream filter when buffer shifted
Michael Niedermayer [Fri, 10 Aug 2012 02:33:42 +0000 (04:33 +0200)]
ffmpeg: Allocate new buffer for bitstream filter when buffer shifted

fix crash with aac_adtstoasc bitstream filter
Fixes Ticket1441

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoyadif: check input video size.
Michael Niedermayer [Thu, 9 Aug 2012 22:09:34 +0000 (00:09 +0200)]
yadif: check input video size.

yadif needs at least 3x3 or it will likely crash with out of array reads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoyadif: remove get_video_buffer, its redundant now
Michael Niedermayer [Thu, 9 Aug 2012 22:09:11 +0000 (00:09 +0200)]
yadif: remove get_video_buffer, its redundant now

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoyadif: redesign first and last 2 lines handling.
Michael Niedermayer [Thu, 9 Aug 2012 22:06:31 +0000 (00:06 +0200)]
yadif: redesign first and last 2 lines handling.

The previous code dependent on the input buffer matching the
buffer that has been provided by yadifs get_buffer.
The API does in now way gurantee this though its often true.
This fixes some out of array reads.
The regression test checksums change due to "out of picture" values
being initialized differently.
There should be no visual difference in the filters output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortmp: Factorize the code by adding handle_invoke_error
Samuel Pitoiset [Thu, 9 Aug 2012 12:57:51 +0000 (14:57 +0200)]
rtmp: Factorize the code by adding handle_invoke_error

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agortmp: Factorize the code by adding handle_invoke_status
Samuel Pitoiset [Thu, 9 Aug 2012 12:57:50 +0000 (14:57 +0200)]
rtmp: Factorize the code by adding handle_invoke_status

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agortmp: Factorize the code by adding handle_invoke_result
Samuel Pitoiset [Thu, 9 Aug 2012 12:57:49 +0000 (14:57 +0200)]
rtmp: Factorize the code by adding handle_invoke_result

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolibavutil: remove unused av_abort() macro
Mans Rullgard [Wed, 8 Aug 2012 21:58:07 +0000 (22:58 +0100)]
libavutil: remove unused av_abort() macro

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoffmenc: replace if/abort with assert()
Mans Rullgard [Wed, 8 Aug 2012 21:57:12 +0000 (22:57 +0100)]
ffmenc: replace if/abort with assert()

The condition is trivially true, but keeping the assert() is
sensible to avoid FFM_HEADER_SIZE ever getting out of sync with
the actual code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agolibavutil: drop offsetof() fallback definition
Mans Rullgard [Wed, 8 Aug 2012 19:09:33 +0000 (20:09 +0100)]
libavutil: drop offsetof() fallback definition

The only compiler I have that does not define the standard
offsetof() macro is "Bruce's C Compiler", a simple compiler
for producing 8/16-bit 8086 code, usually for use in early
stages of PC booting.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agolibavutil: drop fallback definitions of INTxx_MIN/MAX
Mans Rullgard [Wed, 8 Aug 2012 17:18:14 +0000 (18:18 +0100)]
libavutil: drop fallback definitions of INTxx_MIN/MAX

This list is incomplete (we also use UINT16_MAX), so there does
not appear to be any system we care about that needs these.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: Check for a sctp struct instead of just the header
Michael Niedermayer [Wed, 8 Aug 2012 14:01:01 +0000 (16:01 +0200)]
configure: Check for a sctp struct instead of just the header

This fixes build failures on debian/kfreebsd, which has the
sctp.h header, but it is currently broken (a cpp test succeeds,
but a compile test fails), see http://bugs.debian.org/684330 for
details.

Also remove the checked item from HAVE_LIST, since the corresponding
HAVE_* define isn't used by the source code.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoconfigure: suncc: Add -xc99 to dependency flags, required on Solaris
Diego Biurrun [Thu, 9 Aug 2012 15:14:32 +0000 (17:14 +0200)]
configure: suncc: Add -xc99 to dependency flags, required on Solaris

6 years agodoxygen: Fix function parameter names to match the code
Diego Biurrun [Thu, 9 Aug 2012 01:06:01 +0000 (03:06 +0200)]
doxygen: Fix function parameter names to match the code

6 years agodoc: Drop obsolete shared libs cflags hint to workaround Cygwin gcc bugs
Diego Biurrun [Thu, 9 Aug 2012 13:30:24 +0000 (15:30 +0200)]
doc: Drop obsolete shared libs cflags hint to workaround Cygwin gcc bugs

6 years agoswf: Move shared table out of the header file
Diego Biurrun [Wed, 8 Aug 2012 13:54:02 +0000 (15:54 +0200)]
swf: Move shared table out of the header file

6 years agoswf: Move swf_audio_codec_tags table to the only place it is used
Diego Biurrun [Wed, 8 Aug 2012 13:51:59 +0000 (15:51 +0200)]
swf: Move swf_audio_codec_tags table to the only place it is used

6 years agofate: add G.723.1 decoder tests
Kostya Shishkov [Tue, 7 Aug 2012 17:47:55 +0000 (19:47 +0200)]
fate: add G.723.1 decoder tests

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 9 Aug 2012 17:09:39 +0000 (19:09 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: reduce excessive inlining of mpeg_motion()
  mpegvideo: convert mpegvideo_common.h to a .c file
  build: factor out mpegvideo.o dependencies to CONFIG_MPEGVIDEO
  Move MASK_ABS macro to libavcodec/mathops.h
  x86: move MANGLE() and related macros to libavutil/x86/asm.h
  x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h
  aacdec: Don't fall back to the old output configuration when no old configuration is present.
  rtmp: Add message tracking
  rtsp: Support mpegts in raw udp packets
  rtsp: Support receiving plain data over UDP without any RTP encapsulation
  rtpdec: Remove an unused include
  rtpenc: Remove an av_abort() that depends on user-supplied data
  vsrc_movie: discourage its use with avconv.
  avconv: allow no input files.
  avconv: prevent invalid reads in transcode_init()
  avconv: rename OutputStream.is_past_recording_time to finished.

Conflicts:
configure
doc/filters.texi
ffmpeg.c
ffmpeg.h
libavcodec/Makefile
libavcodec/aacdec.c
libavcodec/mpegvideo.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0c00fd80ee4791bd70b634084307fc9f179e0412'
Michael Niedermayer [Thu, 9 Aug 2012 16:37:16 +0000 (18:37 +0200)]
Merge commit '0c00fd80ee4791bd70b634084307fc9f179e0412'

Just for metadata, this change has been integrated by hand already

* commit '0c00fd80ee4791bd70b634084307fc9f179e0412':
  avconv: split the code for processing input packets out of transcode()

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: factorize process_input() out
Michael Niedermayer [Thu, 9 Aug 2012 16:04:17 +0000 (18:04 +0200)]
ffmpeg: factorize process_input() out

Based-on:
commit 0c00fd80ee4791bd70b634084307fc9f179e0412
Author: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a'
Michael Niedermayer [Thu, 9 Aug 2012 13:14:57 +0000 (15:14 +0200)]
Merge commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a'

* commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a':
  avconv: send EOF to lavfi even if flushing the decoder fails
  avconv: get rid of pointless temporary variable.
  avconv: simplify transcode().
  avconv: cosmetics
  avconv: replace no_packet array in transcode() with a var in InputStream
  avconv: remove unused variable from InputFile.
  avconv: remove commented out cruft.
  avconv: maintain sync on lavfi outputs.

Conflicts:
ffmpeg.c
ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomotion_est: drop inline from sad_hpel_motion_search()
Mans Rullgard [Tue, 31 Jul 2012 13:58:09 +0000 (14:58 +0100)]
motion_est: drop inline from sad_hpel_motion_search()

This function is only ever called through a function pointer,
so marking it inline makes no sense.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agomotion_est: remove unused macros
Mans Rullgard [Tue, 31 Jul 2012 13:56:28 +0000 (14:56 +0100)]
motion_est: remove unused macros

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agomotion_est: remove useless no_motion_search() function
Mans Rullgard [Tue, 31 Jul 2012 13:53:57 +0000 (14:53 +0100)]
motion_est: remove useless no_motion_search() function

At both places this function is called, mb_[xy] == s->mb_[xy]
making the call together with following code equivalent to
simply assigning zeros.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodvbsub: reindent after last commit.
Nicolas George [Thu, 9 Aug 2012 09:22:11 +0000 (11:22 +0200)]
dvbsub: reindent after last commit.

6 years agodvbsub: fix encoding of termination packets.
Nicolas George [Wed, 25 Jul 2012 17:45:16 +0000 (19:45 +0200)]
dvbsub: fix encoding of termination packets.

The old code generates a termination packet with the same regions as the
start packet and page_state set to "only what changed"; the result is
that the termination packet is decoded as identical to the start packet.

The new code does as found in some DVB broadcasts: produce a packet with
no regions. This is done by expecting num_rects to be 0 rather than
using a flip-flop. ffmpeg.c is updated accordingly.

6 years agolagarith: frame multithreading
Hendrik Leppkes [Wed, 8 Aug 2012 23:03:44 +0000 (23:03 +0000)]
lagarith: frame multithreading

About 2x speedup going from 1 to 2 threads.
1.7s to 0.85s on foreman CIF.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
6 years agoRemove "Error parsing options string [...]" messages.
Clément Bœsch [Wed, 8 Aug 2012 22:49:27 +0000 (00:49 +0200)]
Remove "Error parsing options string [...]" messages.

This reduces from 3 to 2 messages for the same syntax error in ffprobe,
and from 4 to 3 in filters.

6 years agocheckheaders: Rename HEADEROBJS to HOBJS
jamal [Thu, 9 Aug 2012 02:56:20 +0000 (23:56 -0300)]
checkheaders: Rename HEADEROBJS to HOBJS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: reduce difference to qatar by a few lines
Michael Niedermayer [Thu, 9 Aug 2012 02:12:50 +0000 (04:12 +0200)]
ffmpeg: reduce difference to qatar by a few lines

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocommon.mak: add forgotten hunk from last merge
Michael Niedermayer [Thu, 9 Aug 2012 01:46:43 +0000 (03:46 +0200)]
common.mak: add forgotten hunk from last merge

Found-by: jamal <jamrial@gmail.com>
Author of the hunk: Mans Rullgard <mans@mansr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoxygen: qdm2: Drop documentation for non-existing function parameters
Diego Biurrun [Thu, 9 Aug 2012 01:03:26 +0000 (03:03 +0200)]
doxygen: qdm2: Drop documentation for non-existing function parameters

6 years agobuild: add HOSTOBJS to SUBDIR_VARS list
Diego Biurrun [Wed, 8 Aug 2012 13:41:36 +0000 (15:41 +0200)]
build: add HOSTOBJS to SUBDIR_VARS list

Even though HOSTOBJS are not referenced directly in subdirectory Makefile
snippets right now, robustness requires resetting the variable contents.

6 years agompegvideo: reduce excessive inlining of mpeg_motion()
Mans Rullgard [Sat, 4 Aug 2012 01:30:02 +0000 (02:30 +0100)]
mpegvideo: reduce excessive inlining of mpeg_motion()

The main benefit of inlining this function is from constant
propagation for the 'field_based' argument.  Instead of inlining
all calls, create two versions of the function for field_based
values of 0 and 1.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agompegvideo: convert mpegvideo_common.h to a .c file
Mans Rullgard [Fri, 3 Aug 2012 23:50:21 +0000 (00:50 +0100)]
mpegvideo: convert mpegvideo_common.h to a .c file

This file defines a single, huge function, MPV_motion(), which
although being declared inline is not actually inlined by the
compiler (for good reason).  There is thus no sense in defining
this function in a header file, resulting in multiple copies of
it in the final library.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agobuild: factor out mpegvideo.o dependencies to CONFIG_MPEGVIDEO
Mans Rullgard [Fri, 3 Aug 2012 23:05:46 +0000 (00:05 +0100)]
build: factor out mpegvideo.o dependencies to CONFIG_MPEGVIDEO

This adds a hidden config variable for the mpegvideo.o dependency
and selects from the codecs which require it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoaasc: 8bit support
Paul B Mahol [Wed, 8 Aug 2012 23:59:33 +0000 (23:59 +0000)]
aasc: 8bit support

Closes #1319.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoaasc: fix out of array write
Paul B Mahol [Wed, 8 Aug 2012 14:10:06 +0000 (14:10 +0000)]
aasc: fix out of array write

Closes #1619.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMove MASK_ABS macro to libavcodec/mathops.h
Mans Rullgard [Wed, 8 Aug 2012 16:13:26 +0000 (17:13 +0100)]
Move MASK_ABS macro to libavcodec/mathops.h

This macro is only used in two places, both in libavcodec, so this
is a more sensible place for it.

Two small tweaks to the macro are made:

- removing the trailing semicolon
- dropping unnecessary 'volatile' from the x86 asm

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agox86: move MANGLE() and related macros to libavutil/x86/asm.h
Mans Rullgard [Wed, 8 Aug 2012 13:37:57 +0000 (14:37 +0100)]
x86: move MANGLE() and related macros to libavutil/x86/asm.h

These x86-specific macros do not belong in generic code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agox86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h
Mans Rullgard [Wed, 8 Aug 2012 12:51:52 +0000 (13:51 +0100)]
x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h

This puts x86-specific things in the x86/ subdirectory where they
belong.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoaacdec: Don't fall back to the old output configuration when no old configuration...
Alex Converse [Tue, 7 Aug 2012 19:19:58 +0000 (12:19 -0700)]
aacdec: Don't fall back to the old output configuration when no old configuration is present.

Fixes MP4 files where the first frame is broken.

6 years agobessel: check that the function terminates as expected by av_assert2().
Michael Niedermayer [Wed, 8 Aug 2012 23:42:42 +0000 (01:42 +0200)]
bessel: check that the function terminates as expected by av_assert2().

A clear abort is better than wrong output and a possible crash.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agointeger: switch to av_assert
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>
6 years agointeger: fix typos in asserts
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>
6 years agolavfi: add asetpts audio filter
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>.

6 years agoMerge remote-tracking branch 'qatar/master'
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>
6 years agolavd/x11grab: deprecate "nomouse" specification in filename
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.

6 years agodoc/indevs: document missing options in x11grab section
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.

6 years agolavd/x11grab: apply misc consistency fixes to options definition
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.

6 years agodoc/indevs: use separate @example blocks for separate examples
Stefano Sabatini [Wed, 8 Aug 2012 08:18:38 +0000 (10:18 +0200)]
doc/indevs: use separate @example blocks for separate examples

Improve rendering.

6 years agodoc/indevs: rework options description in the x11 grab section
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.

6 years agodoc/ffmpeg: do not show examples making use of the deprecated glob_sequence pattern...
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.

6 years agolavf/img2dec: add and document pattern_type option
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.

6 years agodoc/demuxers: itemize image2 examples and put them in a dedicated subsection
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

6 years agortmp: Add message tracking
Samuel Pitoiset [Wed, 8 Aug 2012 12:36:39 +0000 (14:36 +0200)]
rtmp: Add message tracking

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortsp: Support mpegts in raw udp packets
Martin Storsjö [Wed, 8 Aug 2012 20:05:52 +0000 (23:05 +0300)]
rtsp: Support mpegts in raw udp packets

This is basically the same way as mpegts packets are parsed in
rtpdec.c.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortsp: Support receiving plain data over UDP without any RTP encapsulation
Martin Storsjö [Wed, 8 Aug 2012 18:37:47 +0000 (21:37 +0300)]
rtsp: Support receiving plain data over UDP without any RTP encapsulation

EvoStream Media Server can serve data in this format, and
VLC/live555 already supports it.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpdec: Remove an unused include
Martin Storsjö [Wed, 8 Aug 2012 18:14:38 +0000 (21:14 +0300)]
rtpdec: Remove an unused include

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpenc: Remove an av_abort() that depends on user-supplied data
Martin Storsjö [Wed, 8 Aug 2012 20:23:28 +0000 (23:23 +0300)]
rtpenc: Remove an av_abort() that depends on user-supplied data

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavf/movenc: use two explicit bytes instead of a short.
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
6 years agolavfi/atempo: remove dead increment.
Clément Bœsch [Sun, 5 Aug 2012 19:10:11 +0000 (21:10 +0200)]
lavfi/atempo: remove dead increment.

6 years agovsrc_movie: discourage its use with avconv.
Anton Khirnov [Sun, 5 Aug 2012 08:24:36 +0000 (10:24 +0200)]
vsrc_movie: discourage its use with avconv.

6 years agoavconv: allow no input files.
Anton Khirnov [Sun, 5 Aug 2012 06:37:43 +0000 (08:37 +0200)]
avconv: allow no input files.

It is now possible to use lavfi sources.

6 years agoavconv: prevent invalid reads in transcode_init()
Anton Khirnov [Sun, 5 Aug 2012 06:30:24 +0000 (08:30 +0200)]
avconv: prevent invalid reads in transcode_init()

6 years agoavconv: rename OutputStream.is_past_recording_time to finished.
Anton Khirnov [Wed, 8 Aug 2012 10:04:53 +0000 (12:04 +0200)]
avconv: rename OutputStream.is_past_recording_time to finished.

The new name is shorter and more accurate, since this variable is no
longer used only for checking recording time constraint.