]> git.sesse.net Git - ffmpeg/log
ffmpeg
12 years agompegtsenc: EAC3 support
Mean [Wed, 2 Nov 2011 19:41:24 +0000 (20:41 +0100)]
mpegtsenc: EAC3 support

Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovc1dec: Fix CODEC_FLAG_LOW_DELAY
Mean [Wed, 2 Nov 2011 18:35:22 +0000 (19:35 +0100)]
vc1dec: Fix CODEC_FLAG_LOW_DELAY

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agompeg4videodec: export quarter_sample & divx_packed
Michael Niedermayer [Wed, 2 Nov 2011 18:48:26 +0000 (19:48 +0100)]
mpeg4videodec: export quarter_sample & divx_packed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoid3v2enc: include strings.h for strcasecmp()
Michael Niedermayer [Wed, 2 Nov 2011 18:10:49 +0000 (19:10 +0100)]
id3v2enc: include strings.h for strcasecmp()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoopt: remove attribute_deprecated from several functions that do not have adequante...
Michael Niedermayer [Wed, 2 Nov 2011 17:41:21 +0000 (18:41 +0100)]
opt: remove attribute_deprecated from several functions that do not have adequante replacements.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoh264: add nal_length_size and is_avc to the publically readable fields
Michael Niedermayer [Wed, 2 Nov 2011 17:39:42 +0000 (18:39 +0100)]
h264: add nal_length_size and is_avc to the publically readable fields

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavc: fix avcodec_get_type()
Michael Niedermayer [Wed, 2 Nov 2011 16:04:46 +0000 (17:04 +0100)]
lavc: fix avcodec_get_type()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoHWAccel: adds Video Decoder Acceleration (VDA) module for Mac OS X.
Sebastien Zwickert [Tue, 1 Nov 2011 23:55:09 +0000 (00:55 +0100)]
HWAccel: adds Video Decoder Acceleration (VDA) module for Mac OS X.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMAINTAINERS: update release manager
Michael Niedermayer [Tue, 1 Nov 2011 11:58:03 +0000 (12:58 +0100)]
MAINTAINERS: update release manager

Found-by: Compn
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoid3v2enc: add support for year and day/month tags when writing id3v2 version 3 metadata
Tobias Rapp [Wed, 2 Nov 2011 10:50:14 +0000 (11:50 +0100)]
id3v2enc: add support for year and day/month tags when writing id3v2 version 3 metadata

Adds support for year (TYER) and day/month (TDAT) tags when writing
id3v2 version 3 metadata by splitting the "date" tag. The date tag
should have a format of "YYYY-MM-DD" or "YYYY".

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodsputil: fix typo (referece -> reference).
Clément Bœsch [Wed, 2 Nov 2011 06:54:44 +0000 (07:54 +0100)]
dsputil: fix typo (referece -> reference).

12 years agojpeg: rgb support
Michael Niedermayer [Wed, 2 Nov 2011 01:26:28 +0000 (02:26 +0100)]
jpeg: rgb support
Fixes Ticket297

Based on a patch by Carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 1 Nov 2011 23:07:44 +0000 (00:07 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Enable w32threads automatically unless explicitly disabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovf_transpose: remove pix_fmts which can currently not be supported.
Michael Niedermayer [Tue, 1 Nov 2011 22:45:28 +0000 (23:45 +0100)]
vf_transpose: remove pix_fmts which can currently not be supported.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodirac: drop unused END_HORIZONTAL
Michael Niedermayer [Tue, 1 Nov 2011 20:56:27 +0000 (21:56 +0100)]
dirac: drop unused END_HORIZONTAL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodirac: fix horizontal_compose_dd97i_ssse3
Michael Niedermayer [Tue, 1 Nov 2011 20:55:37 +0000 (21:55 +0100)]
dirac: fix horizontal_compose_dd97i_ssse3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodirac: Fix mmx/sse haar wavelet compose
Michael Niedermayer [Tue, 1 Nov 2011 20:41:01 +0000 (21:41 +0100)]
dirac: Fix mmx/sse haar wavelet compose

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMAINTAINERS: add myself as mailinglists maintainer
Lou Logan [Tue, 1 Nov 2011 18:02:52 +0000 (10:02 -0800)]
MAINTAINERS: add myself as mailinglists maintainer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agogxf: add timecode information to metadata
Matthieu Bouron [Mon, 31 Oct 2011 18:54:31 +0000 (19:54 +0100)]
gxf: add timecode information to metadata

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoconfigure: fix arch x86_32
Michael Niedermayer [Tue, 1 Nov 2011 13:46:18 +0000 (14:46 +0100)]
configure: fix arch x86_32

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoEnable w32threads automatically unless explicitly disabled
Martin Storsjö [Tue, 1 Nov 2011 14:22:56 +0000 (16:22 +0200)]
Enable w32threads automatically unless explicitly disabled

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoFix compilation of dct-test on ia32.
Carl Eugen Hoyos [Tue, 1 Nov 2011 14:47:15 +0000 (15:47 +0100)]
Fix compilation of dct-test on ia32.

12 years agoTwo extra samples are required before top of the in buffer rather than out
Vladimir Voroshilov [Tue, 1 Nov 2011 08:08:01 +0000 (15:08 +0700)]
Two extra samples are required before top of the in buffer rather than out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agommsh: add return value for mmsh_open()
Michael Niedermayer [Tue, 1 Nov 2011 11:52:19 +0000 (12:52 +0100)]
mmsh: add return value for mmsh_open()

Found-by: cptspiff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMAINTAINERS: add libstagefright
Michael Niedermayer [Tue, 1 Nov 2011 01:56:25 +0000 (02:56 +0100)]
MAINTAINERS: add libstagefright

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMAINTAINERS: update project server
Michael Niedermayer [Tue, 1 Nov 2011 11:57:51 +0000 (12:57 +0100)]
MAINTAINERS: update project server

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 1 Nov 2011 01:02:20 +0000 (02:02 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cmdutils: Rename read_file to cmdutils_read_file

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodirac: disable ff_horizontal_compose_haar0i_sse2() the function is not bitexact
Michael Niedermayer [Mon, 31 Oct 2011 23:43:05 +0000 (00:43 +0100)]
dirac: disable ff_horizontal_compose_haar0i_sse2() the function is not bitexact

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agommsh: do not try to seek to negative tiimestamps, it does not work
Michael Niedermayer [Mon, 31 Oct 2011 22:40:04 +0000 (23:40 +0100)]
mmsh: do not try to seek to negative tiimestamps, it does not work

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomp3enc: avoid truncating id3v1 tags by one byte
Tobias Rapp [Mon, 31 Oct 2011 14:11:37 +0000 (15:11 +0100)]
mp3enc: avoid truncating id3v1 tags by one byte

Avoid writing the trailing null-byte for id3v1 tags if length reaches max length.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agommsh_read_seek: skip header
Michael Niedermayer [Mon, 31 Oct 2011 21:59:56 +0000 (22:59 +0100)]
mmsh_read_seek: skip header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agommsh:_implement a minimal mmsh_seek() so the stream position can be found out.
Michael Niedermayer [Mon, 31 Oct 2011 21:43:38 +0000 (22:43 +0100)]
mmsh:_implement a minimal mmsh_seek() so the stream position can be found out.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoasfdec: Check packet_replic_size earlier
Michael Niedermayer [Mon, 31 Oct 2011 21:42:45 +0000 (22:42 +0100)]
asfdec: Check packet_replic_size earlier

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agommsh: mmsh_read_seek()
Michael Niedermayer [Mon, 31 Oct 2011 19:50:04 +0000 (20:50 +0100)]
mmsh: mmsh_read_seek()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agommsh: split out mmsh_open_internal()
Michael Niedermayer [Mon, 31 Oct 2011 19:49:23 +0000 (20:49 +0100)]
mmsh: split out mmsh_open_internal()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agommsh: move location storage into context
Michael Niedermayer [Mon, 31 Oct 2011 19:45:12 +0000 (20:45 +0100)]
mmsh: move location storage into context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoRevert "Remove detection of mmsh protocol in ffplay."
Michael Niedermayer [Mon, 31 Oct 2011 17:04:39 +0000 (18:04 +0100)]
Revert "Remove detection of mmsh protocol in ffplay."

This reverts commit 2f642393381659f4a198d9c5a96896eebb23de18.

12 years agodirac: alignment for dirac_hpel_filter_v has been fixed
Michael Niedermayer [Mon, 31 Oct 2011 16:03:03 +0000 (17:03 +0100)]
dirac: alignment for dirac_hpel_filter_v has been fixed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodirac: alignment for add_dirac_obmc has been fixed
Michael Niedermayer [Mon, 31 Oct 2011 16:00:59 +0000 (17:00 +0100)]
dirac: alignment for  add_dirac_obmc has been fixed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodirac: alignment for add_rect_clamped has been fixed
Michael Niedermayer [Mon, 31 Oct 2011 16:00:40 +0000 (17:00 +0100)]
dirac: alignment for add_rect_clamped has been fixed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodirac: alignment for put_signed_rect_clamped has been fixed
Michael Niedermayer [Mon, 31 Oct 2011 16:00:03 +0000 (17:00 +0100)]
dirac: alignment for put_signed_rect_clamped has been fixed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodirac: alignment for dirac_hpel_filter_v() has been fixed
Michael Niedermayer [Mon, 31 Oct 2011 15:59:23 +0000 (16:59 +0100)]
dirac: alignment for dirac_hpel_filter_v() has been fixed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodirac: fix stride alignment
Michael Niedermayer [Mon, 31 Oct 2011 15:46:50 +0000 (16:46 +0100)]
dirac: fix stride alignment

This code was already added by Yuvi in c82cbea68273c6f08c4d0e94fc9fd50bfdea4e2b
It was subsequently lost somehow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodirac: fix segfault in horizontal_compose_haar
Michael Niedermayer [Mon, 31 Oct 2011 15:34:26 +0000 (16:34 +0100)]
dirac: fix segfault in horizontal_compose_haar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agocmdutils: Rename read_file to cmdutils_read_file
Martin Storsjö [Mon, 7 Feb 2011 09:49:37 +0000 (11:49 +0200)]
cmdutils: Rename read_file to cmdutils_read_file

This symbol name clashes with a symbol in gnutls, if linking
statically to that library.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agolavfi: bump micro after recent changes in the overlay filter
Stefano Sabatini [Mon, 31 Oct 2011 10:19:53 +0000 (11:19 +0100)]
lavfi: bump micro after recent changes in the overlay filter

12 years agovf_overlay: add support to alpha pre-multiplication in the RGBA path
Stefano Sabatini [Fri, 28 Oct 2011 22:29:25 +0000 (00:29 +0200)]
vf_overlay: add support to alpha pre-multiplication in the RGBA path

Based on the work of Mark Himsley <mark@mdsh.com>.

See thread:
Subject: [FFmpeg-devel] libavfilter: extending overlay filter
Date: Sun, 13 Mar 2011 14:18:42 +0000

12 years agovf_overlay: enable RGB path
Stefano Sabatini [Fri, 28 Oct 2011 22:10:43 +0000 (00:10 +0200)]
vf_overlay: enable RGB path

Add option rgb which forces the RGB path.

12 years agodirac: ff_diracdsp_init_mmx() is only compiled when yasm is available
Michael Niedermayer [Mon, 31 Oct 2011 01:47:23 +0000 (02:47 +0100)]
dirac: ff_diracdsp_init_mmx() is only compiled when yasm is available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 31 Oct 2011 01:26:37 +0000 (02:26 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libdirac/libschroedinger: Drop unnecessary symbol prefixes.
  cmdutils: check fread() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agosws: fallback to mmx2 when yuv2yuvX_sse3() cannot be used.
Michael Niedermayer [Mon, 31 Oct 2011 00:46:06 +0000 (01:46 +0100)]
sws: fallback to mmx2 when yuv2yuvX_sse3() cannot be used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agosws: print a warning on unaligned input on SSE2+
Michael Niedermayer [Mon, 31 Oct 2011 00:36:02 +0000 (01:36 +0100)]
sws: print a warning on unaligned input on SSE2+

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agosws: increase stride alignment requirement for the warning print code.
Michael Niedermayer [Mon, 31 Oct 2011 00:33:24 +0000 (01:33 +0100)]
sws: increase stride alignment requirement for the warning print code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoDirac decoding is supported natively.
Carl Eugen Hoyos [Mon, 31 Oct 2011 00:13:41 +0000 (01:13 +0100)]
Dirac decoding is supported natively.

12 years agoAdd missing 'tab'.
Carl Eugen Hoyos [Mon, 31 Oct 2011 00:11:19 +0000 (01:11 +0100)]
Add missing 'tab'.

12 years agoBump libavcodec minor version for the Dirac decoder.
Carl Eugen Hoyos [Mon, 31 Oct 2011 00:10:07 +0000 (01:10 +0100)]
Bump libavcodec minor version for the Dirac decoder.

12 years agodirac: enable ff_spatial_idwt_init_mmx()
Michael Niedermayer [Sun, 30 Oct 2011 22:29:08 +0000 (23:29 +0100)]
dirac: enable ff_spatial_idwt_init_mmx()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodirac: enable diracdsp_mmx
Michael Niedermayer [Sun, 30 Oct 2011 22:28:48 +0000 (23:28 +0100)]
dirac: enable diracdsp_mmx

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodirac: ff_horizontal_compose_dd97i_ssse3 does not work yet, thus disable it
Michael Niedermayer [Sun, 30 Oct 2011 22:28:07 +0000 (23:28 +0100)]
dirac: ff_horizontal_compose_dd97i_ssse3 does not work yet, thus disable it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodirac: put_dirac_pixels8_mmx() does not work yet, thus disable it.
Michael Niedermayer [Sun, 30 Oct 2011 22:27:38 +0000 (23:27 +0100)]
dirac: put_dirac_pixels8_mmx() does not work yet, thus disable it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodirac: add_rect_clamped does currently not receive aligned data, thus use unaligned...
Michael Niedermayer [Sun, 30 Oct 2011 22:26:29 +0000 (23:26 +0100)]
dirac: add_rect_clamped does currently not receive aligned data, thus use unaligned accesses.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodirac: put_signed_rect_clamped does currently not receive aligned data, thus use...
Michael Niedermayer [Sun, 30 Oct 2011 22:25:49 +0000 (23:25 +0100)]
dirac: put_signed_rect_clamped does currently not receive aligned data, thus use unaligned accesses.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodirac; dirac_hpel_filter_h does currently not receive aligned data thus use unaligned...
Michael Niedermayer [Sun, 30 Oct 2011 22:25:08 +0000 (23:25 +0100)]
dirac; dirac_hpel_filter_h does currently not receive aligned data thus use unaligned accesses.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodirac: dirac_hpel_filter_v does currently not receive aligned data, thus use unaligne...
Michael Niedermayer [Sun, 30 Oct 2011 22:24:19 +0000 (23:24 +0100)]
dirac: dirac_hpel_filter_v does currently not receive aligned data, thus use unaligned accesses.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoDirac: More formating
Jordi Ortiz [Thu, 27 Oct 2011 18:24:17 +0000 (20:24 +0200)]
Dirac: More formating

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoDirac: Doxygen comments and some formatting enhancements
Jordi Ortiz [Thu, 20 Oct 2011 18:18:50 +0000 (20:18 +0200)]
Dirac: Doxygen comments and some formatting enhancements

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoDirac: allcodecs in alphabetical order
Jordi Ortiz [Thu, 20 Oct 2011 16:42:58 +0000 (18:42 +0200)]
Dirac: allcodecs in alphabetical order
(cherry picked from commit b44c20e9f04f29aff09f64659b3c2926e08b46f8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoDirac now returns AVFrames instead of DiracFrames
Jordi Ortiz [Fri, 7 Oct 2011 11:58:21 +0000 (13:58 +0200)]
Dirac now returns AVFrames instead of DiracFrames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoDIRAC Decoder stable version, MMX support removed.
multiple authors [Thu, 6 Oct 2011 15:57:17 +0000 (17:57 +0200)]
DIRAC Decoder stable version, MMX support removed.
Look for MMX_DISABLED to find the disabled functions.

Authors of this code are Marco Gerards <marco@gnu.org> and David Conrad <lessen42@gmail.com>
With changes from Jordi Ortiz <nenjordi@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolibdirac/libschroedinger: Drop unnecessary symbol prefixes.
Diego Biurrun [Sun, 30 Oct 2011 12:19:50 +0000 (13:19 +0100)]
libdirac/libschroedinger: Drop unnecessary symbol prefixes.

The names used in the libdirac/libschroedinger wrappers are long enough as-is.
Bloating them with unnecessary prefixes makes them even more unwieldy.

12 years agovf_overlay: use opt.h API for setting options
Stefano Sabatini [Tue, 25 Oct 2011 22:18:16 +0000 (00:18 +0200)]
vf_overlay: use opt.h API for setting options

Extend syntax, allow to easily add more options later.

12 years agolibmp3lame: log error message in case of invalid number of channels
Stefano Sabatini [Fri, 28 Oct 2011 16:44:28 +0000 (18:44 +0200)]
libmp3lame: log error message in case of invalid number of channels

Also return meaningful error number in place of -1.
Improve feedback.

12 years agoRemove pointless per-frame malloc/free.
Reimar Döffinger [Sat, 29 Oct 2011 11:33:42 +0000 (13:33 +0200)]
Remove pointless per-frame malloc/free.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoMMX put_no_rnd_pixels_l2
David Conrad [Sun, 5 Jul 2009 09:35:14 +0000 (05:35 -0400)]
MMX put_no_rnd_pixels_l2

12 years agopostproc: remove stray +
Michael Niedermayer [Sun, 30 Oct 2011 17:11:09 +0000 (18:11 +0100)]
postproc: remove stray +

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agocmdutils: check fread() return value
Janne Grunau [Sun, 30 Oct 2011 14:34:32 +0000 (15:34 +0100)]
cmdutils: check fread() return value

12 years agoFix deprecated warnings in .bit (de)muxer
Vladimir Voroshilov [Sun, 30 Oct 2011 03:52:06 +0000 (10:52 +0700)]
Fix deprecated warnings in .bit (de)muxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agospdifenc: use special alignment for DTS-HD length_code
Anssi Hannula [Fri, 28 Oct 2011 10:43:13 +0000 (13:43 +0300)]
spdifenc: use special alignment for DTS-HD length_code

Align IEC 61937 length_code for DTS-HD so that
(length_code & 0xf) == 0x8. This is reportedly needed with some
receivers.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
12 years agopropresenc: fix missed LE pixfmt occurance
Michael Niedermayer [Sun, 30 Oct 2011 03:07:44 +0000 (04:07 +0100)]
propresenc: fix missed LE pixfmt occurance

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoproresenc: the encoder expects native endian input.
Michael Niedermayer [Sun, 30 Oct 2011 01:55:01 +0000 (02:55 +0100)]
proresenc: the encoder expects native endian input.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: allow pass 3
Michael Niedermayer [Sun, 30 Oct 2011 01:26:48 +0000 (02:26 +0100)]
ffmpeg: allow pass 3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodoc: add v4l2 example with ALSA instead of OSS.
Clément Bœsch [Sun, 30 Oct 2011 01:07:38 +0000 (02:07 +0100)]
doc: add v4l2 example with ALSA instead of OSS.

12 years agolavd: add v4l and v4l2 aliases.
Clément Bœsch [Sun, 30 Oct 2011 00:39:30 +0000 (02:39 +0200)]
lavd: add v4l and v4l2 aliases.

12 years agoffmpeg: silence two compiler warnings.
Clément Bœsch [Sun, 30 Oct 2011 00:35:34 +0000 (02:35 +0200)]
ffmpeg: silence two compiler warnings.

12 years agodoc: fix and clarify libx264 encoding.
Clément Bœsch [Sun, 30 Oct 2011 00:05:29 +0000 (02:05 +0200)]
doc: fix and clarify libx264 encoding.

tune, fastfirstpass and profile are not available through x264opts.
Since some FFmpeg options don't match the names used in libx264, add
libx264 option names as a reference when needed. And last thing, x264
don't have a manpage ATM, so prefer the x264 --fullhelp over the
unexistant manpage reference.

12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 29 Oct 2011 23:33:41 +0000 (01:33 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (51 commits)
  cin audio: use sign_extend() instead of casting to int16_t
  cin audio: restructure decoding loop to avoid a separate counter variable
  cin audio: use local variable for delta value
  cin audio: remove unneeded cast from void*
  cin audio: validate the channel count
  cin audio: remove unneeded AVCodecContext pointer from CinAudioContext
  dsicin: fix several audio-related fields in the CIN demuxer
  flacdec: use av_get_bytes_per_sample() to get sample size
  dca: handle errors from dca_decode_block()
  dca: return error if the frame header is invalid
  dca: return proper error codes instead of -1
  utvideo: handle empty Huffman trees
  binkaudio: change short to int16_t
  binkaudio: only decode one block at a time.
  binkaudio: store interleaved overlap samples in BinkAudioContext.
  binkaudio: pre-calculate quantization factors
  binkaudio: add some buffer overread checks.
  atrac3: support float or int16 output using request_sample_fmt
  atrac3: add CODEC_CAP_SUBFRAMES capability
  atrac3: return appropriate error codes instead of -1
  ...

Conflicts:
libavcodec/atrac1.c
libavcodec/dca.c
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomjpeg_parser: Rewrite to skip marker segments
Michael Niedermayer [Sat, 29 Oct 2011 21:54:21 +0000 (23:54 +0200)]
mjpeg_parser: Rewrite to skip marker segments

Based on code by Aaron Miller <amiller@atlasdigital.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomjpeg_parser: add MJPEGParserContext
Michael Niedermayer [Sat, 29 Oct 2011 20:27:01 +0000 (22:27 +0200)]
mjpeg_parser: add MJPEGParserContext

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoBump libavformat minor version for the G.729 raw demuxer.
Carl Eugen Hoyos [Sat, 29 Oct 2011 22:03:00 +0000 (00:03 +0200)]
Bump libavformat minor version for the G.729 raw demuxer.

12 years agoAdd G.729 raw demuxer.
Carl Eugen Hoyos [Sat, 29 Oct 2011 22:01:46 +0000 (00:01 +0200)]
Add G.729 raw demuxer.

12 years agoBe more verbose about unsupported H.264 bit-depths.
Carl Eugen Hoyos [Sat, 29 Oct 2011 21:39:02 +0000 (23:39 +0200)]
Be more verbose about unsupported H.264 bit-depths.

12 years agocin audio: use sign_extend() instead of casting to int16_t
Justin Ruggles [Thu, 27 Oct 2011 17:58:05 +0000 (13:58 -0400)]
cin audio: use sign_extend() instead of casting to int16_t

12 years agocin audio: restructure decoding loop to avoid a separate counter variable
Justin Ruggles [Thu, 27 Oct 2011 17:50:02 +0000 (13:50 -0400)]
cin audio: restructure decoding loop to avoid a separate counter variable

Also check output buffer size instead of truncating output.

12 years agocin audio: use local variable for delta value
Justin Ruggles [Thu, 27 Oct 2011 17:41:02 +0000 (13:41 -0400)]
cin audio: use local variable for delta value

12 years agocin audio: remove unneeded cast from void*
Justin Ruggles [Thu, 27 Oct 2011 17:35:25 +0000 (13:35 -0400)]
cin audio: remove unneeded cast from void*

12 years agocin audio: validate the channel count
Justin Ruggles [Thu, 27 Oct 2011 17:33:57 +0000 (13:33 -0400)]
cin audio: validate the channel count

12 years agocin audio: remove unneeded AVCodecContext pointer from CinAudioContext
Justin Ruggles [Thu, 27 Oct 2011 17:28:33 +0000 (13:28 -0400)]
cin audio: remove unneeded AVCodecContext pointer from CinAudioContext

12 years agodsicin: fix several audio-related fields in the CIN demuxer
Justin Ruggles [Thu, 27 Oct 2011 16:46:32 +0000 (12:46 -0400)]
dsicin: fix several audio-related fields in the CIN demuxer

bits_per_coded_sample should be 8.
block_align is calculated incorrectly, but it is not needed anyway.
packet pts should be calculated in samples.
packet duration can be set.

12 years agoMinimal patch for G.729 demuxer
Vladimir Voroshilov [Sat, 29 Oct 2011 17:10:02 +0000 (00:10 +0700)]
Minimal patch for G.729 demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoflacdec: use av_get_bytes_per_sample() to get sample size
Justin Ruggles [Thu, 27 Oct 2011 18:29:28 +0000 (14:29 -0400)]
flacdec: use av_get_bytes_per_sample() to get sample size