ffmpeg.git
7 years agotakdec: fix seeking
Paul B Mahol [Wed, 10 Oct 2012 12:50:22 +0000 (12:50 +0000)]
takdec: fix seeking

The previous approach was just wrong.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 10 Oct 2012 12:13:51 +0000 (14:13 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: sanitize linking of tools and test programs
  fate: Refactor setting of environment variables for groups of tests

Conflicts:
tests/fate/audio.mak
tests/fate/real.mak
tests/fate/voice.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702'
Michael Niedermayer [Wed, 10 Oct 2012 12:04:03 +0000 (14:04 +0200)]
Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702'

* commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702':
  swscale: Do not make ff_ symbols globally visible.
  rtspdec: use av_strlcpy for writing into fixed size buffer
  g722enc: fix size argument in memset
  http: use av_strlcpy instead of strcpy() without size checks
  avfilter: correct memcpy size avfilter_copy_buf_props()
  lavc: split asv12 encoder/decoder

Conflicts:
libavcodec/asvdec.c
libavfilter/buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'
Michael Niedermayer [Wed, 10 Oct 2012 11:51:07 +0000 (13:51 +0200)]
Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'

* commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2':
  avconv: remove -same_quant

Conflicts:
Changelog
doc/faq.texi
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodtshd: remove redundant/wrong avio_tell()
Paul B Mahol [Wed, 10 Oct 2012 11:23:57 +0000 (11:23 +0000)]
dtshd: remove redundant/wrong avio_tell()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agotakdec: remove redundant/wrong avio_tell()
Paul B Mahol [Wed, 10 Oct 2012 11:21:34 +0000 (11:21 +0000)]
takdec: remove redundant/wrong avio_tell()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a'
Michael Niedermayer [Wed, 10 Oct 2012 11:18:05 +0000 (13:18 +0200)]
Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a'

* commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a':
  cmdutils_read_file: increment *size after writing the trailing \0
  af_resample: unref out_buf when avresample_convert returns 0
  af_amix: prevent memory leak on error path
  vc1dec: prevent memory leak in error path
  vc1dec: prevent memory leak on av_realloc error
  af_channelmap: free old extended_data on reallocation
  avconv: simplify memory allocation in copy_chapters
  matroskaenc: check cue point validity before reallocation
  swfenc: error out for more than 1 audio or video stream
  build: link test programs only against static libs

Conflicts:
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f'
Michael Niedermayer [Wed, 10 Oct 2012 11:00:28 +0000 (13:00 +0200)]
Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f'

* commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f':
  adxdec: use planar sample format
  adpcmdec: use planar sample format for adpcm_thp
  adpcmdec: use planar sample format for adpcm_ea_xas
  adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3
  adpcmdec: use planar sample format for adpcm_xa
  adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3
  adpcmdec: use planar sample format for adpcm_4xm
  adpcmdec: use planar sample format for adpcm_ima_wav
  adpcmdec: use planar sample format for adpcm_ima_qt
  pcmdec: use planar sample format for pcm_lxf
  mace: use planar sample format
  atrac1: use planar sample format
  build: non-x86: Only compile mpegvideo optimizations when necessary
  rtpdec_mpeg4: au_headers is a single array, simple av_free is enough
  avcodec: free extended_data instead address of it
  fate: Add tests of the ff_make_absolute_url function
  url: Handle relative urls starting with two slashes
  url: Handle relative urls being just a new query string
  url: Don't treat slashes in query parameters as directory separators

Conflicts:
libavcodec/adxdec.c
libavcodec/mips/Makefile
libavcodec/pcm.c
libavcodec/utils.c
libavformat/Makefile
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: sanitize linking of tools and test programs
Mans Rullgard [Wed, 10 Oct 2012 02:24:50 +0000 (03:24 +0100)]
build: sanitize linking of tools and test programs

This makes sure proper linker arguments are used for the tools and
test programs when shared libraries are enabled.  The tools are
linked using the usual -l flag while for test programs the full
name of the static library is used.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agofate: Refactor setting of environment variables for groups of tests
Diego Biurrun [Fri, 5 Oct 2012 12:27:44 +0000 (14:27 +0200)]
fate: Refactor setting of environment variables for groups of tests

7 years agopcx: use meaningful return values
Paul B Mahol [Wed, 10 Oct 2012 07:49:03 +0000 (07:49 +0000)]
pcx: use meaningful return values

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agox86/dsputil_mmx: change assert() to av_assert()
Michael Niedermayer [Wed, 10 Oct 2012 02:49:41 +0000 (04:49 +0200)]
x86/dsputil_mmx: change assert() to av_assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: Do not make ff_ symbols globally visible.
Diego Biurrun [Thu, 4 Oct 2012 17:22:27 +0000 (19:22 +0200)]
swscale: Do not make ff_ symbols globally visible.

7 years agocrypto should allow passing of options to the underlying protocol via the url_open2...
Duncan Salerno [Tue, 9 Oct 2012 18:13:14 +0000 (19:13 +0100)]
crypto should allow passing of options to the underlying protocol via the url_open2 interface

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/silencedetect: add av_opt_free() call.
Clément Bœsch [Tue, 9 Oct 2012 20:34:35 +0000 (22:34 +0200)]
lavfi/silencedetect: add av_opt_free() call.

This avoids a memleak with noise_str.

7 years agoFix second use of AVOptions in HLS
Duncan Salerno [Tue, 9 Oct 2012 18:08:53 +0000 (19:08 +0100)]
Fix second use of AVOptions in HLS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortspdec: use av_strlcpy for writing into fixed size buffer
Janne Grunau [Tue, 9 Oct 2012 19:03:40 +0000 (21:03 +0200)]
rtspdec: use av_strlcpy for writing into fixed size buffer

Fixes CID231347.

7 years agog722enc: fix size argument in memset
Janne Grunau [Tue, 9 Oct 2012 18:56:58 +0000 (20:56 +0200)]
g722enc: fix size argument in memset

Fixes CID700725.

7 years agohttp: use av_strlcpy instead of strcpy() without size checks
Janne Grunau [Tue, 9 Oct 2012 18:50:50 +0000 (20:50 +0200)]
http: use av_strlcpy instead of strcpy() without size checks

Fixes CID700730.

7 years agoavfilter: correct memcpy size avfilter_copy_buf_props()
Janne Grunau [Tue, 9 Oct 2012 18:38:47 +0000 (20:38 +0200)]
avfilter: correct memcpy size avfilter_copy_buf_props()

Does not make a difference in this case since sizeof(uint8_t*) ==
sizeof(uint8_t**). Fixes CID703814.

7 years agolavc: split asv12 encoder/decoder
Anton Khirnov [Mon, 8 Oct 2012 10:03:08 +0000 (12:03 +0200)]
lavc: split asv12 encoder/decoder

7 years agoavconv: remove -same_quant
Anton Khirnov [Tue, 9 Oct 2012 15:40:20 +0000 (17:40 +0200)]
avconv: remove -same_quant

It has not worked for anything other than fringe codecs (asv1/2, mdec,
mjpeg[b]) since about 2003 and nobody ever noticed or complained. This
sufficiently proves that there are no users of this option who have a
clue of what they are doing, so it is completely useless.

7 years agocmdutils_read_file: increment *size after writing the trailing \0
Janne Grunau [Tue, 9 Oct 2012 15:55:32 +0000 (17:55 +0200)]
cmdutils_read_file: increment *size after writing the trailing \0

Fixes CID732166.

7 years agoaf_resample: unref out_buf when avresample_convert returns 0
Janne Grunau [Tue, 9 Oct 2012 14:28:30 +0000 (16:28 +0200)]
af_resample: unref out_buf when avresample_convert returns 0

Fixes CID732273.

7 years agohttp: add 'timeout' AVOption
Andrey Utkin [Thu, 13 Sep 2012 00:43:32 +0000 (03:43 +0300)]
http: add 'timeout' AVOption

This option is passed though to underlying tcp protocol context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotcp: accept params through avio_open2() options
Andrey Utkin [Thu, 13 Sep 2012 00:43:31 +0000 (03:43 +0300)]
tcp: accept params through avio_open2() options

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotcp: use timeout option consistently
Andrey Utkin [Mon, 8 Oct 2012 07:39:42 +0000 (10:39 +0300)]
tcp: use timeout option consistently

Default _connection_ timeout value 5 seconds is left as i/o timeout also

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoIntroduce ff_network_wait_fd_timeout()
Andrey Utkin [Tue, 9 Oct 2012 12:26:02 +0000 (15:26 +0300)]
Introduce ff_network_wait_fd_timeout()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: include os2threads.h in vp8.h if HAVE_OS2THREADS is enabled
KO Myung-Hun [Tue, 9 Oct 2012 10:29:32 +0000 (19:29 +0900)]
lavc: include os2threads.h in vp8.h if HAVE_OS2THREADS is enabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoCheck for resync marker based on vop coding type- vop_fcode_forward and vop_fcode_bac...
Anuj Mittal [Tue, 9 Oct 2012 13:25:14 +0000 (18:55 +0530)]
Check for resync marker based on vop coding type- vop_fcode_forward and vop_fcode_backward L

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoCheck resync marker only when enabled.
Anuj Mittal [Tue, 9 Oct 2012 12:52:26 +0000 (18:22 +0530)]
Check resync marker only when enabled.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaf_amix: prevent memory leak on error path
Janne Grunau [Tue, 9 Oct 2012 14:15:15 +0000 (16:15 +0200)]
af_amix: prevent memory leak on error path

Fixes CID732272.

7 years agovc1dec: prevent memory leak in error path
Janne Grunau [Tue, 9 Oct 2012 14:09:41 +0000 (16:09 +0200)]
vc1dec: prevent memory leak in error path

Fixes CID732271.

7 years agovc1dec: prevent memory leak on av_realloc error
Janne Grunau [Tue, 9 Oct 2012 14:07:12 +0000 (16:07 +0200)]
vc1dec: prevent memory leak on av_realloc error

7 years agoaf_channelmap: free old extended_data on reallocation
Janne Grunau [Tue, 9 Oct 2012 13:41:24 +0000 (15:41 +0200)]
af_channelmap: free old extended_data on reallocation

Prevents writes to freed memory and the leak of the old extended data.
Fixes CID732303.

7 years agoavconv: simplify memory allocation in copy_chapters
Janne Grunau [Tue, 9 Oct 2012 13:20:15 +0000 (15:20 +0200)]
avconv: simplify memory allocation in copy_chapters

Make just a single reallocation per call instead of one reallocation
per copied chapters. This fixes possible memory leaks on realloc
failures. Also correct the allocation since it needs multiples of
sizeof(AVChapter*) and not sizeof(AVChapter).

Fixes CID700633 and CID700719.

7 years agomatroskaenc: check cue point validity before reallocation
Janne Grunau [Tue, 9 Oct 2012 12:54:01 +0000 (14:54 +0200)]
matroskaenc: check cue point validity before reallocation

Prevents memory leak and possible access to freed memory.
Fixes CID605744.

7 years agoswfenc: error out for more than 1 audio or video stream
Janne Grunau [Tue, 9 Oct 2012 12:48:08 +0000 (14:48 +0200)]
swfenc: error out for more than 1 audio or video stream

Prevents CID602000.

7 years agobuild: link test programs only against static libs
Mans Rullgard [Mon, 8 Oct 2012 19:35:03 +0000 (20:35 +0100)]
build: link test programs only against static libs

The test programs use internal symbols so cannot be linked against the
shared libs.  Linking against both shared and static is pointless and
might do something strange depending on the linker.  This changes the
dependencies so the test programs are linked only against the static
library for the component they belong to.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoadxdec: use planar sample format
Justin Ruggles [Fri, 21 Sep 2012 14:48:12 +0000 (10:48 -0400)]
adxdec: use planar sample format

7 years agoadpcmdec: use planar sample format for adpcm_thp
Justin Ruggles [Fri, 21 Sep 2012 14:32:21 +0000 (10:32 -0400)]
adpcmdec: use planar sample format for adpcm_thp

7 years agoadpcmdec: use planar sample format for adpcm_ea_xas
Justin Ruggles [Fri, 31 Aug 2012 16:42:37 +0000 (12:42 -0400)]
adpcmdec: use planar sample format for adpcm_ea_xas

7 years agoadpcmdec: use planar sample format for adpcm_ea_r1/r2/r3
Justin Ruggles [Fri, 31 Aug 2012 01:33:34 +0000 (21:33 -0400)]
adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3

7 years agoadpcmdec: use planar sample format for adpcm_xa
Justin Ruggles [Thu, 30 Aug 2012 22:08:59 +0000 (18:08 -0400)]
adpcmdec: use planar sample format for adpcm_xa

7 years agoadpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3
Justin Ruggles [Wed, 29 Aug 2012 19:54:39 +0000 (15:54 -0400)]
adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3

7 years agoadpcmdec: use planar sample format for adpcm_4xm
Justin Ruggles [Wed, 29 Aug 2012 19:40:26 +0000 (15:40 -0400)]
adpcmdec: use planar sample format for adpcm_4xm

7 years agoadpcmdec: use planar sample format for adpcm_ima_wav
Justin Ruggles [Wed, 29 Aug 2012 03:58:08 +0000 (23:58 -0400)]
adpcmdec: use planar sample format for adpcm_ima_wav

7 years agoadpcmdec: use planar sample format for adpcm_ima_qt
Justin Ruggles [Wed, 29 Aug 2012 03:39:53 +0000 (23:39 -0400)]
adpcmdec: use planar sample format for adpcm_ima_qt

7 years agopcmdec: use planar sample format for pcm_lxf
Justin Ruggles [Tue, 28 Aug 2012 15:45:39 +0000 (11:45 -0400)]
pcmdec: use planar sample format for pcm_lxf

7 years agomace: use planar sample format
Justin Ruggles [Mon, 27 Aug 2012 18:19:51 +0000 (14:19 -0400)]
mace: use planar sample format

7 years agoatrac1: use planar sample format
Justin Ruggles [Sun, 26 Aug 2012 05:10:51 +0000 (01:10 -0400)]
atrac1: use planar sample format

7 years agobuild: non-x86: Only compile mpegvideo optimizations when necessary
Diego Biurrun [Fri, 24 Aug 2012 00:10:20 +0000 (02:10 +0200)]
build: non-x86: Only compile mpegvideo optimizations when necessary

7 years agortpdec_mpeg4: au_headers is a single array, simple av_free is enough
Janne Grunau [Tue, 9 Oct 2012 12:24:36 +0000 (14:24 +0200)]
rtpdec_mpeg4: au_headers is a single array, simple av_free is enough

Fixes CID700204.

7 years agoavcodec: free extended_data instead address of it
Janne Grunau [Tue, 9 Oct 2012 12:04:46 +0000 (14:04 +0200)]
avcodec: free extended_data instead address of it

Fixes CID732173.

7 years agofate: Add tests of the ff_make_absolute_url function
Martin Storsjö [Fri, 5 Oct 2012 22:38:37 +0000 (01:38 +0300)]
fate: Add tests of the ff_make_absolute_url function

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agourl: Handle relative urls starting with two slashes
Duncan Salerno [Fri, 5 Oct 2012 23:02:18 +0000 (02:02 +0300)]
url: Handle relative urls starting with two slashes

This is defined by RFC 3986 section 5.4.1 to be handled this way.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agourl: Handle relative urls being just a new query string
Duncan Salerno [Fri, 5 Oct 2012 22:58:48 +0000 (01:58 +0300)]
url: Handle relative urls being just a new query string

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agourl: Don't treat slashes in query parameters as directory separators
Duncan Salerno [Fri, 5 Oct 2012 22:57:32 +0000 (01:57 +0300)]
url: Don't treat slashes in query parameters as directory separators

Strip off query parameters from the original url before
applying the new relative path.

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

* qatar/master:
  mingw/cygwin: Stop adding -fno-common to gcc CFLAGS
  Restructure av_log_missing_feature message
  rtp: Support packetization/depacketization of opus
  file: Set the return value type for lseek to int64_t.
  ppc: fix Altivec build with old compilers
  build: add LTO support for PGI compiler
  build: add -Mdse to PGI optimisation flags
  rtpenc_vp8: Update the packetizer to the latest spec version
  rtpdec_vp8: Make the depacketizer implement the latest spec draft
  doc: allow building with old texi2html versions
  avutil: skip old_pix_fmts.h since it is just a list

Conflicts:
libavcodec/aacdec.c
libavcodec/h264.c
libavcodec/ppc/fmtconvert_altivec.c
libavcodec/utils.c
libavformat/file.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomingw/cygwin: Stop adding -fno-common to gcc CFLAGS
Diego Biurrun [Fri, 5 Oct 2012 22:16:41 +0000 (00:16 +0200)]
mingw/cygwin: Stop adding -fno-common to gcc CFLAGS

This was done to work around toolchain bugs that have long been fixed.

7 years agoRestructure av_log_missing_feature message
Diego Biurrun [Mon, 8 Oct 2012 17:08:03 +0000 (19:08 +0200)]
Restructure av_log_missing_feature message

Some invocations include a verb in the log message, others do not.  Yet
av_log_missing_feature expects callers to provide a verb.  Change the
function to include a verb instead and update the callers accordingly.
The result is a more natural function API and correct English in the
function invocations.

7 years agoDTS-HD demuxer
Paul B Mahol [Fri, 5 Oct 2012 12:32:20 +0000 (12:32 +0000)]
DTS-HD demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agortp: Support packetization/depacketization of opus
Martin Storsjö [Mon, 8 Oct 2012 21:51:42 +0000 (00:51 +0300)]
rtp: Support packetization/depacketization of opus

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agofate-lossless-tak: remove unneeded -f s16le
Paul B Mahol [Tue, 9 Oct 2012 08:48:36 +0000 (08:48 +0000)]
fate-lossless-tak: remove unneeded -f s16le

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofile: Set the return value type for lseek to int64_t.
Yusuke Nakamura [Tue, 9 Oct 2012 07:00:28 +0000 (16:00 +0900)]
file: Set the return value type for lseek to int64_t.

This fixes a regression in 4ed5ac5.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoWrite 32bit palette to Targa files.
Carl Eugen Hoyos [Tue, 9 Oct 2012 08:13:14 +0000 (10:13 +0200)]
Write 32bit palette to Targa files.

Current ImageMagick fails to read such files,
therefore only write the 32bit palette if the
palette actually contains any transparency
information.

7 years agora144: fix code with ftrapv.
Michael Niedermayer [Tue, 9 Oct 2012 03:55:40 +0000 (05:55 +0200)]
ra144: fix code with ftrapv.

A better solution is welcome!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoeval: Fix eval test with ftrapv
Michael Niedermayer [Tue, 9 Oct 2012 03:55:15 +0000 (05:55 +0200)]
eval: Fix eval test with ftrapv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: add support to nicely enable ftrapv
Michael Niedermayer [Tue, 9 Oct 2012 03:43:30 +0000 (05:43 +0200)]
configure: add support to nicely enable ftrapv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotarga: cosmetics - add some whitespace
Bobby Bingham [Mon, 8 Oct 2012 05:23:45 +0000 (00:23 -0500)]
targa: cosmetics - add some whitespace

Signed-off-by: Bobby Bingham <uhmmmm@gmail.com>
7 years agotarga: remove unused context members
Bobby Bingham [Mon, 8 Oct 2012 05:23:07 +0000 (00:23 -0500)]
targa: remove unused context members

Signed-off-by: Bobby Bingham <uhmmmm@gmail.com>
7 years agotarga: support 2-way and 4-way interleaved files
Bobby Bingham [Mon, 8 Oct 2012 05:37:26 +0000 (00:37 -0500)]
targa: support 2-way and 4-way interleaved files

Fixes ticket #701

Signed-off-by: Bobby Bingham <uhmmmm@gmail.com>
7 years agotarga: use named constants for flag values
Bobby Bingham [Mon, 8 Oct 2012 04:59:59 +0000 (23:59 -0500)]
targa: use named constants for flag values

Signed-off-by: Bobby Bingham <uhmmmm@gmail.com>
7 years agomotion_est: switch asserts to av_asserts
Michael Niedermayer [Tue, 9 Oct 2012 03:06:39 +0000 (05:06 +0200)]
motion_est: switch asserts to av_asserts

note, the asserts where enabled by default before this

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodsputil: convert asserts to av_asserts
Michael Niedermayer [Tue, 9 Oct 2012 02:07:30 +0000 (04:07 +0200)]
dsputil: convert asserts to av_asserts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadpcmenc: switch to av_assert()
Michael Niedermayer [Tue, 9 Oct 2012 02:00:55 +0000 (04:00 +0200)]
adpcmenc: switch to av_assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoSupport decoding of targa files with 32bit palette.
Carl Eugen Hoyos [Mon, 8 Oct 2012 23:58:48 +0000 (01:58 +0200)]
Support decoding of targa files with 32bit palette.

7 years agoppc: fix Altivec build with old compilers
Mans Rullgard [Mon, 8 Oct 2012 22:01:02 +0000 (23:01 +0100)]
ppc: fix Altivec build with old compilers

The vec_splat() intrinsic requires a constant argument for the
element number, and the code relies on the compiler unrolling
the loop to provide this.  Manually unrolling the loop avoids
this reliance and works with all compilers.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agomovenc.c: Force correct value for "Samples per packet" for pcm audio
Tim Nicholson [Fri, 5 Oct 2012 08:33:12 +0000 (09:33 +0100)]
movenc.c: Force correct value for "Samples per packet" for pcm audio

Apple spec is for it to always be "1" for uncompressed audio.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: add LTO support for PGI compiler
Mans Rullgard [Fri, 5 Oct 2012 02:42:12 +0000 (03:42 +0100)]
build: add LTO support for PGI compiler

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agobuild: add -Mdse to PGI optimisation flags
Mans Rullgard [Fri, 5 Oct 2012 00:30:28 +0000 (01:30 +0100)]
build: add -Mdse to PGI optimisation flags

Enable dead store elimination.  The last few releases work no worse
with this flag than without.  Older versions failed to build some
source files when using this flag.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agortpenc_vp8: Update the packetizer to the latest spec version
Martin Storsjö [Mon, 8 Oct 2012 20:18:38 +0000 (23:18 +0300)]
rtpenc_vp8: Update the packetizer to the latest spec version

Tested to work with the gstreamer depacketizer.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpdec_vp8: Make the depacketizer implement the latest spec draft
Martin Storsjö [Mon, 8 Oct 2012 19:25:55 +0000 (22:25 +0300)]
rtpdec_vp8: Make the depacketizer implement the latest spec draft

Not all details are implemented, but it's enough for proper
playback as long as there is no packet loss.

Tested to work with the packetizer in gstreamer (which although
uses a different codec name, to clarify that it is still a spec
draft).

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 8 Oct 2012 19:36:14 +0000 (21:36 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86)
  x86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86)
  x86: call most of the x86 dsp init functions under if (ARCH_X86)
  doc: support the new website layout
  doc: remove a warning from filters.texi
  doc: initial nut documentation
  segment: drop global headers setting
  lavu: fix typo in Makefile

Conflicts:
doc/Makefile
doc/filters.texi
doc/t2h.init
libavcodec/fmtconvert.c
libavcodec/proresdsp.c
libavcodec/x86/Makefile
libavcodec/x86/vc1dsp_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: allow building with old texi2html versions
Mans Rullgard [Mon, 8 Oct 2012 10:13:35 +0000 (11:13 +0100)]
doc: allow building with old texi2html versions

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoMerge commit '716d413c13981da15323c7a3821860536eefdbbb'
Michael Niedermayer [Mon, 8 Oct 2012 18:54:00 +0000 (20:54 +0200)]
Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

* commit '716d413c13981da15323c7a3821860536eefdbbb':
  Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat

Conflicts:
doc/examples/muxing.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
ffprobe.c
libavcodec/8bps.c
libavcodec/aasc.c
libavcodec/aura.c
libavcodec/avcodec.h
libavcodec/avs.c
libavcodec/bfi.c
libavcodec/bmp.c
libavcodec/bmpenc.c
libavcodec/c93.c
libavcodec/cscd.c
libavcodec/cyuv.c
libavcodec/dpx.c
libavcodec/dpxenc.c
libavcodec/eatgv.c
libavcodec/escape124.c
libavcodec/ffv1.c
libavcodec/flashsv.c
libavcodec/fraps.c
libavcodec/h264.c
libavcodec/huffyuv.c
libavcodec/iff.c
libavcodec/imgconvert.c
libavcodec/indeo3.c
libavcodec/kmvc.c
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libx264.c
libavcodec/ljpegenc.c
libavcodec/mjpegdec.c
libavcodec/mjpegenc.c
libavcodec/motionpixels.c
libavcodec/mpeg12.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo_enc.c
libavcodec/pamenc.c
libavcodec/pcxenc.c
libavcodec/pgssubdec.c
libavcodec/pngdec.c
libavcodec/pngenc.c
libavcodec/pnm.c
libavcodec/pnmdec.c
libavcodec/pnmenc.c
libavcodec/ptx.c
libavcodec/qdrw.c
libavcodec/qpeg.c
libavcodec/qtrleenc.c
libavcodec/raw.c
libavcodec/rawdec.c
libavcodec/rl2.c
libavcodec/sgidec.c
libavcodec/sgienc.c
libavcodec/snowdec.c
libavcodec/snowenc.c
libavcodec/sunrast.c
libavcodec/targa.c
libavcodec/targaenc.c
libavcodec/tiff.c
libavcodec/tiffenc.c
libavcodec/tmv.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavcodec/vb.c
libavcodec/vp3.c
libavcodec/wnv1.c
libavcodec/xl.c
libavcodec/xwddec.c
libavcodec/xwdenc.c
libavcodec/yop.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersrc.c
libavfilter/drawutils.c
libavfilter/formats.c
libavfilter/src_movie.c
libavfilter/vf_ass.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_format.c
libavfilter/vf_hflip.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_transpose.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavformat/movenc.c
libavformat/mxf.h
libavformat/utils.c
libavformat/yuv4mpeg.c
libavutil/imgutils.c
libavutil/pixdesc.c
libswscale/input.c
libswscale/output.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c
libswscale/x86/swscale_template.c
libswscale/x86/yuv2rgb.c
libswscale/x86/yuv2rgb_template.c
libswscale/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu: fix typo in Makefile
Anton Khirnov [Mon, 8 Oct 2012 06:10:23 +0000 (08:10 +0200)]
lavu: fix typo in Makefile

7 years agoMerge commit '78071a1420b425dfb787ac739048f523007b8139'
Michael Niedermayer [Mon, 8 Oct 2012 17:32:59 +0000 (19:32 +0200)]
Merge commit '78071a1420b425dfb787ac739048f523007b8139'

* commit '78071a1420b425dfb787ac739048f523007b8139':
  pixfmt: add AV_ prefixes to PIX_FMT_*

Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 8 Oct 2012 11:11:11 +0000 (13:11 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  af_resample: avoid conversion of identical sample formats for 1 channel
  avcodec: allow either planar or interleaved sample format when encoding mono
  adpcmenc: ensure calls to adpcm_ima_compress_sample() are in the right order
  timefilter: De-doxygenize normal code comments and drop silly ones
  gxf: Include the right header for the avpriv_frame_rate_tab declaration

Conflicts:
libavcodec/adpcmenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil: skip old_pix_fmts.h since it is just a list
Janne Grunau [Mon, 8 Oct 2012 10:09:16 +0000 (12:09 +0200)]
avutil: skip old_pix_fmts.h since it is just a list

7 years agox86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86)
Janne Grunau [Sun, 7 Oct 2012 15:41:10 +0000 (17:41 +0200)]
x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86)

7 years agox86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86)
Janne Grunau [Sun, 7 Oct 2012 15:23:54 +0000 (17:23 +0200)]
x86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86)

7 years agox86: call most of the x86 dsp init functions under if (ARCH_X86)
Janne Grunau [Fri, 5 Oct 2012 17:54:10 +0000 (19:54 +0200)]
x86: call most of the x86 dsp init functions under if (ARCH_X86)

Rename the called dsp init functions to *_init_x86.

7 years agodoc: support the new website layout
Luca Barbato [Sun, 30 Sep 2012 04:02:34 +0000 (06:02 +0200)]
doc: support the new website layout

7 years agodoc: remove a warning from filters.texi
Luca Barbato [Sun, 7 Oct 2012 22:52:38 +0000 (00:52 +0200)]
doc: remove a warning from filters.texi

The tag @table expects @item to mark entries.

7 years agodoc: initial nut documentation
Luca Barbato [Tue, 13 Dec 2011 22:50:20 +0000 (23:50 +0100)]
doc: initial nut documentation

7 years agosegment: drop global headers setting
Luca Barbato [Fri, 5 Oct 2012 03:07:18 +0000 (05:07 +0200)]
segment: drop global headers setting

avconv provides an option to set it externally and there isn't a way for
the outer demuxer to report the inner demuxer flag.

Solves a bad interaction between mpegts and x264, but requires
additional setting for the user.

7 years agoTAK demuxer, decoder and parser
Paul B Mahol [Tue, 2 Oct 2012 13:43:19 +0000 (13:43 +0000)]
TAK demuxer, decoder and parser

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofate/ffprobe: add some stream metadata.
Clément Bœsch [Thu, 27 Sep 2012 07:49:56 +0000 (09:49 +0200)]
fate/ffprobe: add some stream metadata.

7 years agoffserver: fix seeking with ?date=...
Clément Bœsch [Fri, 5 Oct 2012 14:46:01 +0000 (16:46 +0200)]
ffserver: fix seeking with ?date=...

Regression since 5f847bf61dca1fd1a2f65a2f56c9a99d1cb716ab.

After this commit, timestamps pushed by FFmpeg won't be relative
anymore, but absolute (based on the date/time at the beginning of the
push). This will allow seeking to work properly. Before this patch, the
seek was done, but ffm timestamps were way smallers than the absolute
requested timestamp (based on a date), so the seek was done, but to the
end of the stream (which was similar to no effect at all).