ffmpeg.git
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 years agodvbsub: reindent after last commit.
Nicolas George [Thu, 9 Aug 2012 09:22:11 +0000 (11:22 +0200)]
dvbsub: reindent after last commit.

7 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.

7 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.

7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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.

7 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>
7 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>
7 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>
7 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>.

7 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>
7 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.

7 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.

7 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.

7 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.

7 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.

7 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.

7 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.

7 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

7 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>
7 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>
7 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>
7 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>
7 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>
7 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
7 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.

7 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.

7 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.

7 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()

7 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.

7 years agoavconv: split the code for processing input packets out of transcode()
Anton Khirnov [Sat, 4 Aug 2012 16:35:27 +0000 (18:35 +0200)]
avconv: split the code for processing input packets out of transcode()

7 years agolavf: block special characters in dump metadata
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>
7 years agoavconv: send EOF to lavfi even if flushing the decoder fails
Anton Khirnov [Wed, 8 Aug 2012 10:27:50 +0000 (12:27 +0200)]
avconv: send EOF to lavfi even if flushing the decoder fails

7 years agoavconv: get rid of pointless temporary variable.
Anton Khirnov [Sat, 4 Aug 2012 10:17:43 +0000 (12:17 +0200)]
avconv: get rid of pointless temporary variable.

7 years agoavconv: simplify transcode().
Anton Khirnov [Sat, 4 Aug 2012 10:12:50 +0000 (12:12 +0200)]
avconv: simplify transcode().

Operate with a pointer to InputFile instead of its index in input_files.

7 years agoavconv: cosmetics
Anton Khirnov [Sat, 4 Aug 2012 10:06:30 +0000 (12:06 +0200)]
avconv: cosmetics

Replace for (;foo == 0;) with while (!foo)
This is prettier.

7 years agoavconv: replace no_packet array in transcode() with a var in InputStream
Anton Khirnov [Sat, 4 Aug 2012 10:04:02 +0000 (12:04 +0200)]
avconv: replace no_packet array in transcode() with a var in InputStream

This simplifies splitting code for reading from input out of
transcode().

7 years agoavconv: remove unused variable from InputFile.
Anton Khirnov [Sat, 4 Aug 2012 09:53:08 +0000 (11:53 +0200)]
avconv: remove unused variable from InputFile.

7 years agoavconv: remove commented out cruft.
Anton Khirnov [Sat, 4 Aug 2012 09:50:30 +0000 (11:50 +0200)]
avconv: remove commented out cruft.

7 years agoavconv: maintain sync on lavfi outputs.
Anton Khirnov [Fri, 3 Aug 2012 20:09:58 +0000 (22:09 +0200)]
avconv: maintain sync on lavfi outputs.

Before this commit, poll_filters() reads all frames available on each
lavfi output. This does not work for lavfi sources that produce
an unlimited number of frames, e.g. color and similar.

With this commit, poll_filters() reads from output with the lowest
timestamp and returns to wait for more input if no frames are available
on it.

7 years agomatroskadec: fix lace vs block duration.
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>
7 years agolavfi/testsrc: set default value for option "color" to NULL and rework color setting...
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".

7 years agoconfigure: fix sctp check.
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>
7 years agodoc/general: move ZeroCodec to right section
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>
7 years agobuild: cosmetics: Reorder some lists in a more logical fashion
Diego Biurrun [Wed, 8 Aug 2012 00:41:57 +0000 (02:41 +0200)]
build: cosmetics: Reorder some lists in a more logical fashion

7 years agox86: pngdsp: Fix assembly for OS/2
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>
7 years agofate: add test for RTjpeg in nuv with frameheader
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.

7 years agortmp: send check_bw as notification
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.

7 years agog723_1: clip argument for 15-bit version of normalize_bits()
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.

7 years agog723_1: use all LPC vectors in formant postfilter
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.

7 years agoid3v2: Support v2.2 PIC
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>
7 years agoavplay: fix build with lavfi disabled.
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>
7 years agoavconv: split configuring filter configuration to a separate file.
Anton Khirnov [Thu, 2 Aug 2012 06:24:02 +0000 (08:24 +0200)]
avconv: split configuring filter configuration to a separate file.

7 years agoavconv: split option parsing into a separate file.
Anton Khirnov [Wed, 1 Aug 2012 16:23:12 +0000 (18:23 +0200)]
avconv: split option parsing into a separate file.

7 years agompc8: do not leave padding after last frame in buffer for the next decode call
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

7 years agolavf/movenc: add frame rate heuristic for timecode frame rate.
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.

7 years agolavu/timecode: add av_timecode_check_frame_rate().
Clément Bœsch [Fri, 3 Aug 2012 13:40:15 +0000 (15:40 +0200)]
lavu/timecode: add av_timecode_check_frame_rate().

7 years agolavf/mxfenc: better error handling with invalid 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.

7 years agolavf/mxfenc: simplify frame rate checks.
Clément Bœsch [Fri, 3 Aug 2012 08:21:24 +0000 (10:21 +0200)]
lavf/mxfenc: simplify frame rate checks.

7 years agolavc/old_codec_ids: Fix make checkheaders.
jamal [Wed, 8 Aug 2012 06:02:56 +0000 (08:02 +0200)]
lavc/old_codec_ids: Fix make checkheaders.

7 years agompegaudioenc: list supported channel layouts.
Anton Khirnov [Wed, 1 Aug 2012 05:33:56 +0000 (07:33 +0200)]
mpegaudioenc: list supported channel layouts.

7 years agompegaudiodec: don't print an error on > 1 frame in a packet.
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.

7 years agoapi-example: update to new audio encoding API.
Anton Khirnov [Tue, 31 Jul 2012 13:32:02 +0000 (15:32 +0200)]
api-example: update to new audio encoding API.

7 years agocavs: fix memleak
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>
7 years agox86inc.asm: remove redundant ifdef __YASM_VER__
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>
7 years agolibtwolame: fix stupid bug
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>
7 years agorename missed CodecID to AVCodecID
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>
7 years agoconfigure: add --enable/disable-random option
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>
7 years agoMerge remote-tracking branch 'qatar/master'
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>
7 years agogifdec: return more meaningful error codes
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>
7 years agogifdec: remove redundant "gif: " from av_dlog()
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>
7 years agogifdec: pass avctx to av_log()
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>
7 years agodoc: cygwin: Update list of FATE package requirements
Diego Biurrun [Tue, 7 Aug 2012 12:56:38 +0000 (14:56 +0200)]
doc: cygwin: Update list of FATE package requirements

7 years agobuild: Remove all installed headers and header directories on uninstall
Diego Biurrun [Tue, 7 Aug 2012 15:05:34 +0000 (17:05 +0200)]
build: Remove all installed headers and header directories on uninstall

7 years agoMerge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
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>
7 years agobuild: change checkheaders to use regular build rules
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>
7 years agortmp: Add a new option 'rtmp_subscribe'
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>
7 years agortmp: Add support for subscribing live streams
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>
7 years agortmp: Factorize simultaneous URLProtocol / AVClass declarations with a macro
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>
7 years agobuild: Fix some paths in uninstall-libs
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>
7 years agocheckheaders: Fix directory creation in out-of-tree builds.
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>
7 years agoARM: use Q/R inline asm operand modifiers only if supported
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>
7 years agoMerge commit 'f5d2c597e99af218b0d4d1cf9737c7e68ee934e4'
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>
7 years agopnmdec: make ff_pnm_decode_header() more robust
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>
7 years agopnmdec: make pnm_get more robust
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>