ffmpeg.git
7 years agoMerge commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e'
Michael Niedermayer [Fri, 5 Oct 2012 14:14:06 +0000 (16:14 +0200)]
Merge commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e'

* commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e':
  segment: Add an option for disabling writing of a header/trailer to each segment

Conflicts:
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'eb447d515956b3ce182d9750083131735f00324c'
Michael Niedermayer [Fri, 5 Oct 2012 13:41:45 +0000 (15:41 +0200)]
Merge commit 'eb447d515956b3ce182d9750083131735f00324c'

* commit 'eb447d515956b3ce182d9750083131735f00324c':
  segment: Free and reinit the muxer before calling avformat_write_header

Conflicts:
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87'
Michael Niedermayer [Fri, 5 Oct 2012 13:12:54 +0000 (15:12 +0200)]
Merge commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87'

* commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87':
  segment: Use the public av_write_header/av_write_trailer functions

Conflicts:
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '0edae4e6286096023cdd6adea74722fa06029867'
Michael Niedermayer [Fri, 5 Oct 2012 13:03:02 +0000 (15:03 +0200)]
Merge commit '0edae4e6286096023cdd6adea74722fa06029867'

* commit '0edae4e6286096023cdd6adea74722fa06029867':
  segment: Properly create new AVStreams for the chained muxer
  segment: Add a missing space

Conflicts:
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/h264: don't touch H264Context->ref_count[] during MB decoding.
Ronald S. Bultje [Thu, 4 Oct 2012 07:01:45 +0000 (09:01 +0200)]
lavc/h264: don't touch H264Context->ref_count[] during MB decoding.

The variable is copied to subsequent threads at the same time, so this
may cause wrong ref_count[] values to be copied to subsequent threads.

This bug was found using TSAN and Helgrind.

Original patch by Ronald, adapted with a local_ref_count by Clément,
following the suggestion of Michael Niedermayer.

Signed-off-by: Clément Bœsch <clement.boesch@smartjog.com>
7 years agohls: Disable http seekability probing
Duncan Salerno [Tue, 2 Oct 2012 21:22:44 +0000 (22:22 +0100)]
hls: Disable http seekability probing

Some HLS servers return 403 when the Range header is present. Disabling http
seekability probing prevents the header from being added.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohttp: prevent the Range header being sent when seekability probing isnt used
Duncan Salerno [Tue, 2 Oct 2012 21:22:44 +0000 (22:22 +0100)]
http: prevent the Range header being sent when seekability probing isnt used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohttp: add option to prevent probing for HTTP seekability
Duncan Salerno [Tue, 2 Oct 2012 21:22:44 +0000 (22:22 +0100)]
http: add option to prevent probing for HTTP seekability

Add an tri-state (seek, non seek, automatic detection) option to HTTP to control seekability (default: automatic).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg2videodec: fix list of supported frame rates to include sane ext rates.
Michael Niedermayer [Fri, 5 Oct 2012 00:51:19 +0000 (02:51 +0200)]
mpeg2videodec: fix list of supported frame rates to include sane ext rates.

This only adds a subset of the frame rates that can be stored, a full list
would be more than 500 entries. Such full list could (and should) be added
if it has a usecase but the number of users of even the now added rates
seem rather small.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibspeexenc: Updated commentary to reflect recent changes
Dmitry Samonenko [Thu, 4 Oct 2012 20:42:31 +0000 (00:42 +0400)]
libspeexenc: Updated commentary to reflect recent changes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibspeexenc: Add an option for enabling DTX
Dmitry Samonenko [Thu, 4 Oct 2012 20:36:16 +0000 (00:36 +0400)]
libspeexenc: Add an option for enabling DTX

Discontinuous transmission is an addition to VAD/VBR operation, that
allows to greatly reduce bitrate for silent chunks or stationary
noises.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaacenc: fix out of array writes
Michael Niedermayer [Thu, 4 Oct 2012 20:54:29 +0000 (22:54 +0200)]
aacenc: fix out of array writes

The value used in allocation is based on a estimate of the
maximum size of the spectral coefficients multiplied with 2
and rounded up. The exact or a tighter limit should be
found and used instead. But this issue shouldnt be left
open until someone works on that.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomovenc.c: Add support for >16bit BE flavours
Tim Nicholson [Tue, 2 Oct 2012 10:18:04 +0000 (11:18 +0100)]
movenc.c: Add support for >16bit BE flavours

Currently only LE handled correctly
Updated fate checksums to reflect new headers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: autodetect realtime streams and enable infbuf
Michael Niedermayer [Thu, 4 Oct 2012 15:35:20 +0000 (17:35 +0200)]
ffplay: autodetect realtime streams and enable infbuf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: add a 3rd state to infbuf for autodetection
Michael Niedermayer [Thu, 4 Oct 2012 15:34:47 +0000 (17:34 +0200)]
ffplay: add a 3rd state to infbuf for autodetection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg2enc: support and use frame_rate_ext when needed
Michael Niedermayer [Thu, 4 Oct 2012 13:25:30 +0000 (15:25 +0200)]
mpeg2enc: support and use frame_rate_ext when needed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 4 Oct 2012 11:20:50 +0000 (13:20 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_overlay: properly sync inputs.

Conflicts:
libavfilter/vf_overlay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b'
Michael Niedermayer [Thu, 4 Oct 2012 11:11:45 +0000 (13:11 +0200)]
Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b'

* commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b':
  vf_overlay: get rid of pointless messing with timebase.
  samplefmt: make av_samples_alloc() initialize the data to silence.
  libspeexdec: handle NULL return value from speex_packet_to_header()
  h264probe: Don't error out on bits that no longer are reserved
  mpegvideo: set extended_data in ff_update_duplicate_context()
  libspeexdec: properly handle DTX for multiple frames-per-packet
  libspeexdec: move the SpeexHeader from LibSpeexContext to where it is used
  libspeexdec: simplify setting of frame_size
  libspeexdec: set channel_layout

Conflicts:
libavfilter/vf_overlay.c
libavformat/h264dec.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosegment: Add an option for disabling writing of a header/trailer to each segment
Martin Storsjö [Tue, 2 Oct 2012 21:49:46 +0000 (23:49 +0200)]
segment: Add an option for disabling writing of a header/trailer to each segment

Some segmented formats (such as fragmented mp4) are "bare", as in,
the segment files do not have the same headers/trailers as full normal
files of that format have.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agosegment: Free and reinit the muxer before calling avformat_write_header
Martin Storsjö [Wed, 3 Oct 2012 21:15:35 +0000 (00:15 +0300)]
segment: Free and reinit the muxer before calling avformat_write_header

This makes sure the muxers are set up in the way they expect
with no data left around from the previous run (which could
cause various issues including memory leaks, depending on the chaine
muxer).

This fixes memory leaks with the mpegts and flv muxers. It also
makes the usage of chained muxers correct.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agosegment: Use the public av_write_header/av_write_trailer functions
Martin Storsjö [Sat, 25 Feb 2012 23:31:14 +0000 (01:31 +0200)]
segment: Use the public av_write_header/av_write_trailer functions

With this change, the segmenter muxer doesn't rely on anything
not available/supported to libavformat external users, making
the segmenter muxer do things just like a normal segmenter
application using libavformat would do.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agosegment: Properly create new AVStreams for the chained muxer
Martin Storsjö [Sat, 25 Feb 2012 23:39:32 +0000 (01:39 +0200)]
segment: Properly create new AVStreams for the chained muxer

Before, the chained muxer reused the AVStreams array from
the outer muxer, which made it impossible to use the proper
public functions (such as av_write_frame) when calling the
chained muxer.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agosegment: Add a missing space
Martin Storsjö [Wed, 3 Oct 2012 21:03:45 +0000 (00:03 +0300)]
segment: Add a missing space

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoMerge commit '29abb04e73b0580ebe38703cadb988d26df6a76a'
Michael Niedermayer [Thu, 4 Oct 2012 10:30:25 +0000 (12:30 +0200)]
Merge commit '29abb04e73b0580ebe38703cadb988d26df6a76a'

* commit '29abb04e73b0580ebe38703cadb988d26df6a76a':
  libspeexdec: If the channel count is not valid, decode as stereo.
  libspeexdec: improve setting of Speex mode and sample rate
  libspeex: Add a private option for enabling VAD
  xtea: Test inplace decryption
  xtea: Fix CBC decryption when src==dst
  xtea: Factorize testing into a separate function
  configure: Refactor HAVE_ options available on the command line
  avconv/avprobe: Add missing 'void' to exit_program() definition
  Allow use of strncpy()
  blowfish: Add more tests
  blowfish: Fix CBC decryption with dst==src
  blowfish: Factorize testing into a separate function

Conflicts:
configure
libavcodec/libspeexdec.c
libavutil/xtea.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_overlay: properly sync inputs.
Anton Khirnov [Wed, 3 Oct 2012 20:34:50 +0000 (22:34 +0200)]
vf_overlay: properly sync inputs.

Right now it incorrectly assumes that the frames are sent in the proper
order, which worked with old ffmpeg and avconv versions by accident.

7 years agovf_overlay: get rid of pointless messing with timebase.
Anton Khirnov [Sun, 30 Sep 2012 07:49:53 +0000 (09:49 +0200)]
vf_overlay: get rid of pointless messing with timebase.

Output frames correspond 1:1 to input frames on the main input.
So use the main input timebase for output.

7 years agosamplefmt: make av_samples_alloc() initialize the data to silence.
Anton Khirnov [Wed, 3 Oct 2012 05:54:45 +0000 (07:54 +0200)]
samplefmt: make av_samples_alloc() initialize the data to silence.

Right now the buffer is zeroed, which does not represent silence for U8(P).

7 years agoafq: sanity assert on remaining_samples
Michael Niedermayer [Thu, 4 Oct 2012 00:43:01 +0000 (02:43 +0200)]
afq: sanity assert on remaining_samples

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoafq: update remaining samples variable.
Michael Niedermayer [Thu, 4 Oct 2012 00:36:58 +0000 (02:36 +0200)]
afq: update remaining samples variable.

Fixes Ticket1785 (opusenc used this variable)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomovenc: force video timebase to be 0.1ms precisse at least.
Michael Niedermayer [Wed, 3 Oct 2012 22:51:44 +0000 (00:51 +0200)]
movenc: force video timebase to be 0.1ms precisse at least.

The timebases before where only guranteed to be 1/fps precisse
and could cause AV sync errors on low fps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibspeexdec: handle NULL return value from speex_packet_to_header()
Justin Ruggles [Wed, 3 Oct 2012 21:26:16 +0000 (17:26 -0400)]
libspeexdec: handle NULL return value from speex_packet_to_header()

This will happen when the extradata is not a valid Speex header.

7 years agoh264probe: Don't error out on bits that no longer are reserved
Michael Niedermayer [Mon, 9 May 2011 14:05:29 +0000 (16:05 +0200)]
h264probe: Don't error out on bits that no longer are reserved

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agompegvideo: set extended_data in ff_update_duplicate_context()
Janne Grunau [Wed, 3 Oct 2012 19:41:52 +0000 (21:41 +0200)]
mpegvideo: set extended_data in ff_update_duplicate_context()

AVFrame.extended_data has to reset to the AVFrame.data of the current
thread context after copying the frame contents.
Fixes crashes with frame-threading after 2bc0de38584.

7 years agolibspeexdec: If the channel count is not valid, decode as stereo.
Justin Ruggles [Mon, 1 Oct 2012 01:59:03 +0000 (21:59 -0400)]
libspeexdec: If the channel count is not valid, decode as stereo.

When initialized as stereo, libspeex can decode either mono or stereo packets
and will output stereo.

7 years agolibspeexdec: properly handle DTX for multiple frames-per-packet
Justin Ruggles [Mon, 1 Oct 2012 03:11:43 +0000 (23:11 -0400)]
libspeexdec: properly handle DTX for multiple frames-per-packet

7 years agolibspeexdec: move the SpeexHeader from LibSpeexContext to where it is used
Justin Ruggles [Mon, 1 Oct 2012 03:09:19 +0000 (23:09 -0400)]
libspeexdec: move the SpeexHeader from LibSpeexContext to where it is used

7 years agolibspeexdec: simplify setting of frame_size
Justin Ruggles [Mon, 1 Oct 2012 02:45:55 +0000 (22:45 -0400)]
libspeexdec: simplify setting of frame_size

7 years agolibspeexdec: set channel_layout
Justin Ruggles [Mon, 1 Oct 2012 02:14:10 +0000 (22:14 -0400)]
libspeexdec: set channel_layout

7 years agolibspeexdec: improve setting of Speex mode and sample rate
Justin Ruggles [Mon, 1 Oct 2012 01:45:24 +0000 (21:45 -0400)]
libspeexdec: improve setting of Speex mode and sample rate

If there is no extradata and the sample rate given by the user is not valid,
decode as ultra-wideband.

7 years agoff_choose_timebase: only try factors upto 14
Michael Niedermayer [Wed, 3 Oct 2012 19:38:56 +0000 (21:38 +0200)]
ff_choose_timebase: only try factors upto 14

otherwise a unexpected timebase could be choosen
that is one that is thousand times more precisse than requested
which can have sideeffects.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomux/nut: factorize ff_choose_timebase() out of nut
Michael Niedermayer [Wed, 3 Oct 2012 19:34:43 +0000 (21:34 +0200)]
mux/nut: factorize ff_choose_timebase() out of nut

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibspeex: Add a private option for enabling VAD
Dmitry Samonenko [Sat, 29 Sep 2012 11:47:28 +0000 (15:47 +0400)]
libspeex: Add a private option for enabling VAD

Speex detects non-speech periods and encodes them with just enough bits
to reproduce the background noise, aka ``comfort noise generation''.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agotiffenc: remove unused variable
Michael Niedermayer [Wed, 3 Oct 2012 16:20:28 +0000 (18:20 +0200)]
tiffenc: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoxtea: Test inplace decryption
Michael Niedermayer [Sun, 30 Sep 2012 15:36:01 +0000 (17:36 +0200)]
xtea: Test inplace decryption

Based on test code by: Giorgio Vazzana <mywing81@gmail.com>

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoxtea: Fix CBC decryption when src==dst
Michael Niedermayer [Sun, 30 Sep 2012 15:46:37 +0000 (17:46 +0200)]
xtea: Fix CBC decryption when src==dst

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoxtea: Factorize testing into a separate function
Martin Storsjö [Wed, 3 Oct 2012 16:19:37 +0000 (19:19 +0300)]
xtea: Factorize testing into a separate function

Based on a patch by Michael Niedermayer.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoconfigure: Refactor HAVE_ options available on the command line
Diego Biurrun [Wed, 5 Sep 2012 09:35:13 +0000 (11:35 +0200)]
configure: Refactor HAVE_ options available on the command line

7 years agoavconv/avprobe: Add missing 'void' to exit_program() definition
Diego Biurrun [Wed, 3 Oct 2012 14:20:41 +0000 (16:20 +0200)]
avconv/avprobe: Add missing 'void' to exit_program() definition

7 years agoframecrcenc: print flags and side data elements
Michael Niedermayer [Tue, 2 Oct 2012 19:21:51 +0000 (21:21 +0200)]
framecrcenc: print flags and side data elements

The new fields are only printed when they differ from their defaults
this way only few fate refs change

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoparser: fix large overreads
Michael Niedermayer [Wed, 3 Oct 2012 14:06:23 +0000 (16:06 +0200)]
parser: fix large overreads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/h264: move ff_init_cabac_states() from decode_slice() to ff_h264_decode_init().
Clément Bœsch [Wed, 3 Oct 2012 13:14:40 +0000 (15:14 +0200)]
lavc/h264: move ff_init_cabac_states() from decode_slice() to ff_h264_decode_init().

This fixes one of the potential races spotted by Helgrind.

7 years agoAllow use of strncpy()
Mans Rullgard [Sun, 9 Sep 2012 13:07:20 +0000 (14:07 +0100)]
Allow use of strncpy()

There are cases where strncpy() does exactly what is required.
A blanket ban forces more convoluted solutions to be used in those
cases and has been a cause of bugs.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoblowfish: Add more tests
Martin Storsjö [Mon, 1 Oct 2012 20:49:17 +0000 (23:49 +0300)]
blowfish: Add more tests

Test inplace ECB, normal CBC and inplace CBC encryption/decryption.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoblowfish: Fix CBC decryption with dst==src
Martin Storsjö [Mon, 1 Oct 2012 21:04:38 +0000 (00:04 +0300)]
blowfish: Fix CBC decryption with dst==src

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoblowfish: Factorize testing into a separate function
Martin Storsjö [Mon, 1 Oct 2012 20:38:50 +0000 (23:38 +0300)]
blowfish: Factorize testing into a separate function

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 3 Oct 2012 11:34:57 +0000 (13:34 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ARM: use numeric ID for Tag_ABI_align_preserved
  segment: Pass the interrupt callback on to the chained AVFormatContext, too
  ARM: bswap: drop armcc version of av_bswap16()
  ARM: set Tag_ABI_align_preserved in all asm files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoARM: use numeric ID for Tag_ABI_align_preserved
Mans Rullgard [Tue, 2 Oct 2012 23:42:57 +0000 (00:42 +0100)]
ARM: use numeric ID for Tag_ABI_align_preserved

Some old assemblers still in use do not support named tags.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoffv1dec: print bps for pict debug too
Michael Niedermayer [Wed, 3 Oct 2012 03:43:32 +0000 (05:43 +0200)]
ffv1dec: print bps for pict debug too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago8svx: Fixing header size, move decoding to per call instead of the first call.
Justin Ruggles [Wed, 3 Oct 2012 01:42:33 +0000 (03:42 +0200)]
8svx: Fixing header size, move decoding to per call instead of the first call.

The fate checksum change is due to the header size having been wrong.

Credit&Authorship for the code belongs to Justin Ruggles
Blame for bugs in this merging of the code belong to the Commiter
Commit message by Commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago8svx: avoid custom clip, avoid +128 for compressed data.
Michael Niedermayer [Wed, 3 Oct 2012 00:35:27 +0000 (02:35 +0200)]
8svx: avoid custom clip, avoid +128 for compressed data.

Based on:
commit e3718784160a5bfed8de9622afda19313ec7ca50
Author: Justin Ruggles <justin.ruggles@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago8svx: fix delta_decode cliping limits
Michael Niedermayer [Tue, 2 Oct 2012 23:52:29 +0000 (01:52 +0200)]
8svx: fix delta_decode cliping limits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago8svx: copy start value in output samples.
Nicolas George [Tue, 31 Jul 2012 16:34:45 +0000 (18:34 +0200)]
8svx: copy start value in output samples.

Otherwise, the last byte of each stream is left uninitialized.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffserver: fix potential buffer overflow, based on wrong fscanf format indentifier.
Martin Ettl [Tue, 2 Oct 2012 20:57:25 +0000 (22:57 +0200)]
ffserver: fix potential buffer overflow, based on wrong fscanf format indentifier.

Fixed Ticket1780

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago8svx: remove malloc and memcpy that have become unneeded
Michael Niedermayer [Tue, 2 Oct 2012 20:44:09 +0000 (22:44 +0200)]
8svx: remove malloc and memcpy that have become unneeded

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosegment: Pass the interrupt callback on to the chained AVFormatContext, too
Martin Storsjö [Sat, 25 Feb 2012 23:35:13 +0000 (01:35 +0200)]
segment: Pass the interrupt callback on to the chained AVFormatContext, too

This might not be needed at the moment, but it's good practice to
pass it to all chained AVFormatContexts, if it would happen to be
used there at a later point.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agofix exit_program() prototypes
Michael Niedermayer [Tue, 2 Oct 2012 19:55:17 +0000 (21:55 +0200)]
fix exit_program() prototypes

This fixes 2 warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoARM: bswap: drop armcc version of av_bswap16()
Mans Rullgard [Tue, 2 Oct 2012 15:34:34 +0000 (16:34 +0100)]
ARM: bswap: drop armcc version of av_bswap16()

This function causes several versions of armcc to miscompile code,
and the performance impact is small.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoARM: set Tag_ABI_align_preserved in all asm files
Mans Rullgard [Tue, 2 Oct 2012 15:00:48 +0000 (16:00 +0100)]
ARM: set Tag_ABI_align_preserved in all asm files

All our ARM asm preserves alignment so setting this attribute
in a common location is simpler.  This removes numerous warnings
when linking with armcc.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 2 Oct 2012 17:43:01 +0000 (19:43 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ARM: fix Thumb PIC on Apple
  nut: add do {} while (0) to GET_V
  tiffenc: Check av_malloc() results.
  tiffenc: Simplify pixel format setup using AVPixFmtDescriptor.
  Use atexit() instead of defining a custom exit_program() interface.
  msvc: Fix detection of VFW & Avisynth required libs

Conflicts:
ffmpeg.c
ffmpeg_opt.c
ffplay.c
ffprobe.c
ffserver.c
libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1e46c63eb72be752e044ba32257d77f35cbd9dac'
Michael Niedermayer [Tue, 2 Oct 2012 16:48:56 +0000 (18:48 +0200)]
Merge commit '1e46c63eb72be752e044ba32257d77f35cbd9dac'

* commit '1e46c63eb72be752e044ba32257d77f35cbd9dac':
  avformat: refactor avformat_write_header

Conflicts:
libavformat/mux.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '86bbdf865e04bc5ddc2021b0620e6de634375253'
Michael Niedermayer [Tue, 2 Oct 2012 16:31:47 +0000 (18:31 +0200)]
Merge commit '86bbdf865e04bc5ddc2021b0620e6de634375253'

* commit '86bbdf865e04bc5ddc2021b0620e6de634375253':
  avformat: refactor avformat_write_header

Conflicts:
libavformat/mux.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd'
Michael Niedermayer [Tue, 2 Oct 2012 16:15:13 +0000 (18:15 +0200)]
Merge commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd'

* commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd':
  avformat: split muxing functions from util.c

Conflicts:
libavformat/internal.h
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibopusenc: use more specific and correct name for the channel order
Michael Niedermayer [Tue, 2 Oct 2012 15:34:10 +0000 (17:34 +0200)]
libopusenc: use more specific and correct name for the channel order

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0'
Michael Niedermayer [Tue, 2 Oct 2012 14:25:58 +0000 (16:25 +0200)]
Merge commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0'

* commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0':
  adpcmdec: set AVCodec.sample_fmts
  twinvq: use planar sample format
  ralf: use planar sample format
  mpc7/8: use planar sample format
  iac/imc: use planar sample format
  dcadec: use float planar sample format
  cook: use planar sample format
  atrac3: use float planar sample format
  apedec: output in planar sample format
  8svx: use planar sample format

Conflicts:
libavcodec/8svx.c
libavcodec/dcadec.c
libavcodec/mpc7.c
libavcodec/mpc8.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'
Michael Niedermayer [Tue, 2 Oct 2012 12:38:01 +0000 (14:38 +0200)]
Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'

* commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d':
  avconv: improve sample format negotiation for decoder request
  Opus encoder using libopus
  mpegts: Drop pointless casting of hex_dump_debug arguments
  avformat: const correctness for av_hex_dump / av_hex_dump_log
  wmadec: Adjust debug printf argument length modifier

Conflicts:
Changelog
ffmpeg.c
libavcodec/libopusdec.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomov: add option to ignore edit lists.
Michael Niedermayer [Tue, 2 Oct 2012 03:28:27 +0000 (05:28 +0200)]
mov: add option to ignore edit lists.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoARM: fix Thumb PIC on Apple
Mans Rullgard [Mon, 1 Oct 2012 23:32:24 +0000 (00:32 +0100)]
ARM: fix Thumb PIC on Apple

LDR with register offset and PC as base register is not available in
the Thumb instruction set so the addition must be done separately.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agonut: add do {} while (0) to GET_V
Luca Barbato [Tue, 2 Oct 2012 02:13:23 +0000 (04:13 +0200)]
nut: add do {} while (0) to GET_V

Make it consistent with the other function-like macros.

7 years agodoc/swresample.txt: fix typos
Stefano Sabatini [Mon, 1 Oct 2012 20:44:53 +0000 (22:44 +0200)]
doc/swresample.txt: fix typos

7 years agolavfi/transpose: add passthrough option
Stefano Sabatini [Sun, 30 Sep 2012 11:46:01 +0000 (13:46 +0200)]
lavfi/transpose: add passthrough option

7 years agolavfi/transpose: add support to named options and shortands
Stefano Sabatini [Sun, 30 Sep 2012 11:03:08 +0000 (13:03 +0200)]
lavfi/transpose: add support to named options and shortands

Allow extensibility.

7 years agotiffenc: Check av_malloc() results.
Alex Converse [Wed, 19 Sep 2012 18:12:58 +0000 (11:12 -0700)]
tiffenc: Check av_malloc() results.

7 years agotiffenc: Simplify pixel format setup using AVPixFmtDescriptor.
Alex Converse [Wed, 19 Sep 2012 18:10:26 +0000 (11:10 -0700)]
tiffenc: Simplify pixel format setup using AVPixFmtDescriptor.

7 years agoLibspeex VAD support
Dmitry Samonenko [Sat, 29 Sep 2012 11:47:28 +0000 (15:47 +0400)]
Libspeex VAD support

Option for Voice Activity Detection is added to speex encoder.

Speex detects non-speech periods and encodes them with just enough bits
to reproduce the background noise, aka ``comfort noise generation''.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: print muxed packet sizes in debug output too
Michael Niedermayer [Tue, 2 Oct 2012 00:14:02 +0000 (02:14 +0200)]
ffmpeg: print muxed packet sizes in debug output too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agonutenc: choose for non audio streams a timebase with finer resolution.
Michael Niedermayer [Mon, 1 Oct 2012 21:51:35 +0000 (23:51 +0200)]
nutenc: choose for non audio streams a timebase with finer resolution.

While a 25 fps stream can in general store frame durations in 1/25
units, this is not true for the timestamps. For example a 25fps
and a 25000/1001 fps stream when they are stored together might have
a matching 0 timestamp point but when for example a chapter from
this is cut the new start is no longer aligned. The issue gets
MUCH worse when the streams are lower fps, like 1 or 2 fps.

This commit thus makes the muxer choose a multiple of the
framerate as timebase that is at least about 20 micro seconds precise

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agonut: store and read the r_frame_rate
Michael Niedermayer [Mon, 1 Oct 2012 22:41:40 +0000 (00:41 +0200)]
nut: store and read the r_frame_rate

With this, when we use a finer timebase than neccessary to store
durations the demuxer still knows what the original timebase was.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agonutenc: use 1/sample rate as timebase for audio instead of framesize/sample rate
Michael Niedermayer [Mon, 1 Oct 2012 19:56:27 +0000 (21:56 +0200)]
nutenc: use 1/sample rate as timebase for audio instead of framesize/sample rate

This way audio frames can be exactly stored even when they are not
aligned with timestamp 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoisom: fix redundant redeclaration of ff_mov_read_chan().
Clément Bœsch [Sat, 29 Sep 2012 23:22:18 +0000 (01:22 +0200)]
isom: fix redundant redeclaration of ff_mov_read_chan().

Silence a GCC warning. A leftover of the disabled version is still
available in lavf/isom.c.

7 years agoUse atexit() instead of defining a custom exit_program() interface.
Diego Elio Pettenò [Wed, 5 Sep 2012 07:03:56 +0000 (07:03 +0000)]
Use atexit() instead of defining a custom exit_program() interface.

7 years agomsvc: Fix detection of VFW & Avisynth required libs
Derek Buitenhuis [Mon, 1 Oct 2012 18:39:30 +0000 (18:39 +0000)]
msvc: Fix detection of VFW & Avisynth required libs

It should be vfw32.lib with MSVC.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agolavfi/edgedetect: add missing minus in a comment.
Clément Bœsch [Mon, 1 Oct 2012 20:31:14 +0000 (22:31 +0200)]
lavfi/edgedetect: add missing minus in a comment.

7 years agolavfi: EBU R.128 scanner.
Clément Bœsch [Sat, 18 Aug 2012 01:26:07 +0000 (03:26 +0200)]
lavfi: EBU R.128 scanner.

7 years agoMove xGA font data from lavc to lavu.
Clément Bœsch [Sat, 22 Sep 2012 07:56:33 +0000 (09:56 +0200)]
Move xGA font data from lavc to lavu.

This needs to be accessible for libavfilter in the next commit.

7 years agoavformat: refactor avformat_write_header
Luca Barbato [Sun, 30 Sep 2012 22:49:18 +0000 (00:49 +0200)]
avformat: refactor avformat_write_header

Split away option settings, sanity checks and general setup.

7 years agoavformat: refactor avformat_write_header
Luca Barbato [Sun, 30 Sep 2012 22:49:17 +0000 (00:49 +0200)]
avformat: refactor avformat_write_header

Mostly cosmetic changes adding some intermediate to shorten the lines.

7 years agoavformat: split muxing functions from util.c
Luca Barbato [Sun, 30 Sep 2012 22:49:16 +0000 (00:49 +0200)]
avformat: split muxing functions from util.c

7 years agoadpcmdec: set AVCodec.sample_fmts
Justin Ruggles [Fri, 21 Sep 2012 14:33:56 +0000 (10:33 -0400)]
adpcmdec: set AVCodec.sample_fmts

7 years agotwinvq: use planar sample format
Justin Ruggles [Tue, 28 Aug 2012 19:29:40 +0000 (15:29 -0400)]
twinvq: use planar sample format

7 years agoralf: use planar sample format
Justin Ruggles [Tue, 28 Aug 2012 17:04:49 +0000 (13:04 -0400)]
ralf: use planar sample format