ffmpeg.git
4 years agoMerge commit '3f3232a371cc88696184d9aef1f812656264e56c'
Michael Niedermayer [Wed, 9 Jul 2014 19:44:25 +0000 (21:44 +0200)]
Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'

* commit '3f3232a371cc88696184d9aef1f812656264e56c':
  avconv: set the output stream timebase

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c9c1265c52910578d3db1a6205c85b91ead0903f'
Michael Niedermayer [Wed, 9 Jul 2014 19:37:05 +0000 (21:37 +0200)]
Merge commit 'c9c1265c52910578d3db1a6205c85b91ead0903f'

* commit 'c9c1265c52910578d3db1a6205c85b91ead0903f':
  avformat: update muxing doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9'
Michael Niedermayer [Wed, 9 Jul 2014 19:29:21 +0000 (21:29 +0200)]
Merge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9'

* commit 'abda15a990527557c20848f6ca2f82eb85e76dc9':
  cdg: set the keyframe flag on the first packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/roqvideoenc: Print the correct max resolution
Michael Niedermayer [Wed, 9 Jul 2014 19:14:24 +0000 (21:14 +0200)]
avcodec/roqvideoenc: Print the correct max resolution

Thanks-to: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/roqvideoenc: More verbose warning about no power of 2 dimensions
Michael Niedermayer [Wed, 9 Jul 2014 19:10:13 +0000 (21:10 +0200)]
avcodec/roqvideoenc: More verbose warning about no power of 2 dimensions

Thanks-to: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dvdsubenc: Add dvdsub workaround for some players
Oliver Fromme [Wed, 9 Jul 2014 16:43:58 +0000 (18:43 +0200)]
avcodec/dvdsubenc: Add dvdsub workaround for some players

The issue affects dvdsub subtitles (a.k.a. VOBSUB).

Some players -- in particular hardware players -- cut off
the lowest row of pixels if the number of rows in the subtitle
is odd.

The patch below implements a work-around for that.  If the
number of rows is odd, it is simply rounded up to an even
number, adding an invisible (i.e. fully transparent) row.
The work-around can be enabled or disabled with a new
option -even_rows_fix.  The default is disabled, so there
is no change of behaviour for users who don't care about it.

The overhead for the fix is low, and in many cases even zero:
For subtitles with an odd number of rows (i.e. in 50% of
cases on average), the size increases by two bytes because
a fully transparent row is encoded as 0x00 0x00.  However,
in the VOBSUB standard, all data packets are padded to 2KB
anyway, so in most cases the additional bytes just use some
part of the padding, so there is no overhead.  Only in the
rare case that the 2KB boundary is hit (0.1% chance), a full
2KB block is added.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/pthread_frame: fix setting hwaccel with threads and get_format()
Michael Niedermayer [Wed, 9 Jul 2014 17:51:49 +0000 (19:51 +0200)]
avcodec/pthread_frame: fix setting hwaccel with threads and get_format()

Fixes assertion failure with vdpau and vlc
Fixes Ticket3742

Tested-by: oromit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/bprint:ædd io.h, try to fix msvc build
Michael Niedermayer [Wed, 9 Jul 2014 15:58:20 +0000 (17:58 +0200)]
avutil/bprint:ædd io.h, try to fix msvc build

Suggested-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/m4vdec: raise threshold slightly for detection
Michael Niedermayer [Wed, 9 Jul 2014 15:02:34 +0000 (17:02 +0200)]
avformat/m4vdec: raise threshold slightly for detection

Fixes Ticket3746

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo: clip mv visualization arrows so that their direction is maintained
Michael Niedermayer [Wed, 9 Jul 2014 13:53:23 +0000 (15:53 +0200)]
avcodec/mpegvideo: clip mv visualization arrows so that their direction is maintained

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavconv: set the output stream timebase
Anton Khirnov [Wed, 9 Jul 2014 10:33:03 +0000 (10:33 +0000)]
avconv: set the output stream timebase

This is required by the new API.

4 years agoavformat: update muxing doxy
Anton Khirnov [Wed, 9 Jul 2014 10:26:03 +0000 (10:26 +0000)]
avformat: update muxing doxy

The callers should now set the stream timebase, not the codec one.

4 years agocdg: set the keyframe flag on the first packet
Anton Khirnov [Fri, 4 Jul 2014 15:52:03 +0000 (15:52 +0000)]
cdg: set the keyframe flag on the first packet

Bug-Id: 55

4 years agoFix wmv1 encoding if all other msmpeg4-related encoders were disabled.
Carl Eugen Hoyos [Wed, 9 Jul 2014 06:51:17 +0000 (08:51 +0200)]
Fix wmv1 encoding if all other msmpeg4-related encoders were disabled.

4 years agoFix wmv1 decoding if no other msmpeg4-related decoder was compiled.
Carl Eugen Hoyos [Wed, 9 Jul 2014 06:27:24 +0000 (08:27 +0200)]
Fix wmv1 decoding if no other msmpeg4-related decoder was compiled.

4 years agoavcodec/mpegvideo: flip motion vector visualization for backward motion vectors
Michael Niedermayer [Wed, 9 Jul 2014 01:07:25 +0000 (03:07 +0200)]
avcodec/mpegvideo: flip motion vector visualization for backward motion vectors

Also support changing arrow head/tail shape

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice/pulse_audio_dec: reimplement using the non simple API
Michael Niedermayer [Tue, 8 Jul 2014 02:28:33 +0000 (04:28 +0200)]
avdevice/pulse_audio_dec: reimplement using the non simple API

This fixes timestamps

Based-on: code from pulseaudio
Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/movenc: respect color_range when encoding dnxhd.
Mark Boorer [Tue, 8 Jul 2014 21:09:57 +0000 (22:09 +0100)]
avformat/movenc: respect color_range when encoding dnxhd.

Set the ACLR atom appropriately for legal / full range.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/segment: remove gettimeofday() use, remove sys/time.h
Michael Niedermayer [Tue, 8 Jul 2014 20:51:16 +0000 (22:51 +0200)]
avformat/segment: remove gettimeofday() use, remove sys/time.h

It causes portability issues, and would need ifdef hell if its kept

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoalpha/idctdsp: move idct init code out of dsputil
James Almer [Tue, 8 Jul 2014 20:08:24 +0000 (17:08 -0300)]
alpha/idctdsp: move idct init code out of dsputil

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mpegts: pass MpegTSContext ptr explicitly (fixes #3721)
Alexander V. Lukyanov [Tue, 8 Jul 2014 07:54:15 +0000 (11:54 +0400)]
avformat/mpegts: pass MpegTSContext ptr explicitly (fixes #3721)

AVFormatContext->priv_data is not always a MpegTSContext, it can be
RTSPState when decoding a RTP stream. So it is necessary to pass
MpegTSContext pointer explicitly.

This fixes memory corruption from bug #3721 (RTSPState is smaller than
MpegTSContext thus innocent memory gets overwritten).

Signed-off-by: Alexander V. Lukyanov <lavv17f@gmail.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294'
Michael Niedermayer [Tue, 8 Jul 2014 19:53:09 +0000 (21:53 +0200)]
Merge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294'

* commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294':
  mov: Remove a variable that is set but never used

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'cf280ed004b5c618560f8f43d14ff264bd1e4c3d'
Michael Niedermayer [Tue, 8 Jul 2014 19:38:17 +0000 (21:38 +0200)]
Merge commit 'cf280ed004b5c618560f8f43d14ff264bd1e4c3d'

* commit 'cf280ed004b5c618560f8f43d14ff264bd1e4c3d':
  avplay: Handle pixel aspect ratio properly

See: 32fdfdfbdac64c57b12910521af1379a24d01f73
See: 99b01e458c268cf18ac0981e644e0f835957498a
See: 825ec16da955fd9c726d8e6c846cf9257a781a87
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917'
Michael Niedermayer [Tue, 8 Jul 2014 19:08:01 +0000 (21:08 +0200)]
Merge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917'

* commit '52a1c32c0a86e84d43f977c5148e62975a0c6917':
  nut: Use nut->version in the version range check

Conflicts:
libavformat/nutdec.c

Note, this bug did not affect ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice/lavfi: add io.h, should fix msvc build
Michael Niedermayer [Tue, 8 Jul 2014 18:29:59 +0000 (20:29 +0200)]
avdevice/lavfi: add io.h, should fix msvc build

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/alpha/dsputil_alpha: fix build
Michael Niedermayer [Tue, 8 Jul 2014 18:15:31 +0000 (20:15 +0200)]
avcodec/alpha/dsputil_alpha: fix build

Disable moved functions to prevent build/test failure,
patch to update and re-enable them is welcome
volunteer to maintain the alpha code is welcome too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomov: Remove a variable that is set but never used
Martin Storsjö [Mon, 7 Jul 2014 19:07:49 +0000 (22:07 +0300)]
mov: Remove a variable that is set but never used

This silences a warning with gcc.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavplay: Handle pixel aspect ratio properly
Martin Storsjö [Sun, 6 Jul 2014 20:18:27 +0000 (23:18 +0300)]
avplay: Handle pixel aspect ratio properly

This was broken (left half-implemented) in 354468fc12.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agonut: Use nut->version in the version range check
Luca Barbato [Mon, 7 Jul 2014 18:48:34 +0000 (20:48 +0200)]
nut: Use nut->version in the version range check

It was wrongly left unchanged when the version field had been
introduced. (c94e2e85cb6af8a570d8542a830556243bd32873)

4 years agoavcodec/proresenc_anatoliy: check against maximum dimensions
Michael Niedermayer [Tue, 8 Jul 2014 16:03:11 +0000 (18:03 +0200)]
avcodec/proresenc_anatoliy: check against maximum dimensions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/roqvideoenc: check dimensions against maximum
Michael Niedermayer [Tue, 8 Jul 2014 15:33:39 +0000 (17:33 +0200)]
avcodec/roqvideoenc: check dimensions against maximum

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/roqvideoenc: fix infinite lambda increasing loop
Michael Niedermayer [Tue, 8 Jul 2014 15:05:27 +0000 (17:05 +0200)]
avcodec/roqvideoenc: fix infinite lambda increasing loop

The threshold was choosen so that no further size decrease happened with larger lambda
with the test video.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/nutdec: if all else fails try to lookup video tag in isom
Michael Niedermayer [Tue, 8 Jul 2014 14:26:23 +0000 (16:26 +0200)]
avformat/nutdec: if all else fails try to lookup video tag in isom

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/movenc: check that the video resolution is supported
Michael Niedermayer [Tue, 8 Jul 2014 14:17:44 +0000 (16:17 +0200)]
avformat/movenc: check that the video resolution is supported

Resolutions are stored as 16bit integers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '79fce1ec8abd017593c003917fc123f7119a78d6'
Michael Niedermayer [Tue, 8 Jul 2014 12:44:12 +0000 (14:44 +0200)]
Merge commit '79fce1ec8abd017593c003917fc123f7119a78d6'

* commit '79fce1ec8abd017593c003917fc123f7119a78d6':
  arm: Avoid using the 'setend' instruction on ARMv7 and newer

Conflicts:
libavcodec/arm/h264dsp_init_arm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe'
Michael Niedermayer [Tue, 8 Jul 2014 12:27:52 +0000 (14:27 +0200)]
Merge commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe'

* commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe':
  avformat_new_stream: make the AVCodec parameter const

Conflicts:
libavformat/utils.c

See: e12cfd044c2bae4a099a3b9384b148424858d72b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b'
Michael Niedermayer [Tue, 8 Jul 2014 11:20:08 +0000 (13:20 +0200)]
Merge commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b'

* commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b':
  af_compand: make sure request_frame always outputs at least one frame

See: 6b68e2a43b3407522080be50a2a19cff2f9715ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoarm: Avoid using the 'setend' instruction on ARMv7 and newer
Martin Storsjö [Fri, 4 Jul 2014 15:21:50 +0000 (18:21 +0300)]
arm: Avoid using the 'setend' instruction on ARMv7 and newer

This instruction is deprecated on ARMv8, and it is serializing on
some ARMv7 cores as well [1].

[1] http://article.gmane.org/gmane.linux.ports.arm.kernel/339293

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavformat_new_stream: make the AVCodec parameter const
Roman Savchenko [Tue, 8 Jul 2014 08:24:09 +0000 (08:24 +0000)]
avformat_new_stream: make the AVCodec parameter const

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoaf_compand: make sure request_frame always outputs at least one frame
Andrew Kelley [Sun, 6 Jul 2014 05:24:43 +0000 (22:24 -0700)]
af_compand: make sure request_frame always outputs at least one frame

This fixes a segmentation fault because request_frame in fifo.c assumes
that the call to ff_request_frame will populate fifo->root.next.
Before, it was possible for request_frame in af_compand to not do this,
resulting in a null pointer access. Now, request_frame in af_compand
always will return at least one frame or an error, as per the API
specifications in avfilter.h for request_frame.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoMerge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'
Michael Niedermayer [Tue, 8 Jul 2014 01:12:10 +0000 (03:12 +0200)]
Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'

* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3':
  dsputil: Split off FDCT bits into their own context

Conflicts:
configure
libavcodec/Makefile
libavcodec/asvenc.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/crystalhd: Add #if HAVE_UNISTD_H around #include <unistd.h>
Michael Niedermayer [Tue, 8 Jul 2014 00:48:51 +0000 (02:48 +0200)]
avcodec/crystalhd: Add #if HAVE_UNISTD_H around  #include <unistd.h>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/cpu: Use HAVE_UNISTD_H instead of HAVE_SYSCONF for #include <unistd.h>
Michael Niedermayer [Tue, 8 Jul 2014 00:50:24 +0000 (02:50 +0200)]
avutil/cpu: Use HAVE_UNISTD_H instead of HAVE_SYSCONF for #include <unistd.h>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_drawtext: Add #if HAVE_UNISTD_H around #include <unistd.h>
Michael Niedermayer [Tue, 8 Jul 2014 00:48:51 +0000 (02:48 +0200)]
avfilter/vf_drawtext: Add #if HAVE_UNISTD_H around  #include <unistd.h>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice/oss_audio: Add #if HAVE_UNISTD_H around #include <unistd.h>
Michael Niedermayer [Tue, 8 Jul 2014 00:48:51 +0000 (02:48 +0200)]
avdevice/oss_audio: Add #if HAVE_UNISTD_H around  #include <unistd.h>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: add doxygen target tag
Timothy Gu [Mon, 7 Jul 2014 22:24:49 +0000 (15:24 -0700)]
doc: add doxygen target tag

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: make doxygen program configurable
Timothy Gu [Mon, 7 Jul 2014 22:24:48 +0000 (15:24 -0700)]
doc: make doxygen program configurable

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: add doxy-wrapper.sh to doc/doxygen/html dependencies
Timothy Gu [Mon, 7 Jul 2014 22:24:47 +0000 (15:24 -0700)]
doc: add doxy-wrapper.sh to doc/doxygen/html dependencies

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffserver: add HAVE_UNISTD_H around #include <unistd.h>
Michael Niedermayer [Mon, 7 Jul 2014 23:55:47 +0000 (01:55 +0200)]
ffserver: add HAVE_UNISTD_H around #include <unistd.h>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h>
Michael Niedermayer [Mon, 7 Jul 2014 23:55:47 +0000 (01:55 +0200)]
tools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libxvid: add HAVE_UNISTD_H around #include <unistd.h>
Michael Niedermayer [Mon, 7 Jul 2014 23:55:47 +0000 (01:55 +0200)]
avcodec/libxvid: add HAVE_UNISTD_H around #include <unistd.h>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoprotect unistd.h with #if HAVE_UNISTD_H in code from recent av_bprint_fd_contents...
Michael Niedermayer [Mon, 7 Jul 2014 23:45:43 +0000 (01:45 +0200)]
protect unistd.h with #if HAVE_UNISTD_H in code from recent av_bprint_fd_contents() patches

Should fix build failure on MSVC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample: misc. doxy improvements
Timothy Gu [Mon, 7 Jul 2014 22:23:49 +0000 (15:23 -0700)]
swresample: misc. doxy improvements

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/Doxyfile: use 5 columns for alphabetical index
Michael Niedermayer [Mon, 7 Jul 2014 22:43:18 +0000 (00:43 +0200)]
doc/Doxyfile: use 5 columns for alphabetical index

This reverts a hunk from 671005558a295945f5d4cfd1abca6832af479c0b
Reduces diff to what we use on the server
Suggested-by: Timothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d'
Michael Niedermayer [Mon, 7 Jul 2014 21:16:59 +0000 (23:16 +0200)]
Merge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d'

* commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d':
  libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc'
Michael Niedermayer [Mon, 7 Jul 2014 21:04:11 +0000 (23:04 +0200)]
Merge commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc'

* commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc':
  smoothstreamingenc: Fix a memory leak on errors

See: a53c5d454ee608fd539e5c02ade3f246470d1cb2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vmdvideo: remove unneeded include
Michael Niedermayer [Mon, 7 Jul 2014 20:29:29 +0000 (22:29 +0200)]
avcodec/vmdvideo: remove unneeded include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/segment: simplify localtime* use
Michael Niedermayer [Mon, 7 Jul 2014 20:29:02 +0000 (22:29 +0200)]
avformat/segment: simplify localtime* use

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/segment: Support cutting at clocktime
Deti fliegl [Mon, 7 Jul 2014 19:35:43 +0000 (21:35 +0200)]
avformat/segment: Support cutting at clocktime

Signed-off-by: Deti fliegl <fliegl@baycom.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodsputil: Split off FDCT bits into their own context
Diego Biurrun [Mon, 3 Feb 2014 18:09:45 +0000 (10:09 -0800)]
dsputil: Split off FDCT bits into their own context

4 years agoavdevice/lavfi: allow non-mmappable files for graph_file
Andrey Utkin [Thu, 3 Jul 2014 11:37:09 +0000 (14:37 +0300)]
avdevice/lavfi: allow non-mmappable files for graph_file

Use av_bprint_fd_contents() instead of av_file_map()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/bprint: Add av_bprint_fd_contents()
Andrey Utkin [Thu, 3 Jul 2014 11:37:08 +0000 (14:37 +0300)]
avutil/bprint: Add av_bprint_fd_contents()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream
Omer Osman [Mon, 7 Jul 2014 08:28:12 +0000 (10:28 +0200)]
libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream

For implicit signaling cases (as possible for Spectral Band Replication
and Parametric Stereo Tools), the decoder must decode the first frame to
correctly identify the stream configuration (as called from
avformat_find_stream_info). The mechanism for this is built-in and only
requires adding CODEC_CAP_CHANNEL_CONF to the libfdk-aacdec AVCodec
struct.

Signed-off-by: Omer Osman <omer.osman@iis.fraunhofer.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agosmoothstreamingenc: Fix a memory leak on errors
Michael Niedermayer [Sun, 6 Jul 2014 03:02:38 +0000 (05:02 +0200)]
smoothstreamingenc: Fix a memory leak on errors

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoMerge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503'
Michael Niedermayer [Mon, 7 Jul 2014 16:01:16 +0000 (18:01 +0200)]
Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503'

* commit '246f869590b8c7313d26e1c2ef56db01f6fd2503':
  vmd: Split audio and video decoder

Conflicts:
libavcodec/vmdvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovmd: Split audio and video decoder
Nidhi Makhijani [Mon, 7 Jul 2014 04:11:04 +0000 (09:41 +0530)]
vmd: Split audio and video decoder

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agoavcodec/cljrdec: remove unneeded include
Michael Niedermayer [Mon, 7 Jul 2014 14:31:51 +0000 (16:31 +0200)]
avcodec/cljrdec: remove unneeded include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'
Michael Niedermayer [Mon, 7 Jul 2014 13:54:17 +0000 (15:54 +0200)]
Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'

* commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b':
  dsputil: Move draw_edges() to mpegvideoencdsp

Conflicts:
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'
Michael Niedermayer [Mon, 7 Jul 2014 13:27:11 +0000 (15:27 +0200)]
Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'

* commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d':
  dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc

Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94'
Michael Niedermayer [Mon, 7 Jul 2014 13:04:05 +0000 (15:04 +0200)]
Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94'

* commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94':
  dsputil: Split off *_8x8basis to a separate context

Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo_enc: fix b frame strategy 2
Michael Niedermayer [Mon, 7 Jul 2014 12:51:41 +0000 (14:51 +0200)]
avcodec/mpegvideo_enc: fix b frame strategy 2

Fixes Ticket3757

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotranscoding: fix Doxygen file path
Timothy Gu [Mon, 7 Jul 2014 00:19:24 +0000 (17:19 -0700)]
transcoding: fix Doxygen file path

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo: small indent fix in vismv code
Clément Bœsch [Mon, 7 Jul 2014 09:26:15 +0000 (11:26 +0200)]
avcodec/mpegvideo: small indent fix in vismv code

4 years agoavcodec: make vismv option as flag types
Clément Bœsch [Mon, 7 Jul 2014 08:23:55 +0000 (10:23 +0200)]
avcodec: make vismv option as flag types

This allows for example -vismv pf+bf+bb instead of -vismv 7.

4 years agoavcodec/roqvideodec: set JPEG output color range
Eric Lasota [Sun, 6 Jul 2014 22:13:14 +0000 (18:13 -0400)]
avcodec/roqvideodec: set JPEG output color range

Signed-off-by: Eric Lasota <ejlasota@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6'
Michael Niedermayer [Sun, 6 Jul 2014 22:55:36 +0000 (00:55 +0200)]
Merge commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6'

* commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6':
  audio_fifo: Split into a separate doxygen module

Conflicts:
libavutil/audio_fifo.h

See: 689e02808d09bd0441ec199cb1a8953ac7c666f6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd69243d39b773b64614792487cd93f6ceb237b25'
Michael Niedermayer [Sun, 6 Jul 2014 22:32:29 +0000 (00:32 +0200)]
Merge commit 'd69243d39b773b64614792487cd93f6ceb237b25'

* commit 'd69243d39b773b64614792487cd93f6ceb237b25':
  samplefmt: Add doxygen categories

Conflicts:
libavutil/samplefmt.h

See: b27555a3a05f8a39c58ac98561411555da3f4a6f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'
Michael Niedermayer [Sun, 6 Jul 2014 22:04:22 +0000 (00:04 +0200)]
Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'

* commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192':
  dsicin: Split audio and video decoder

Conflicts:
libavcodec/Makefile
libavcodec/dsicinvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodsputil: Move draw_edges() to mpegvideoencdsp
Diego Biurrun [Mon, 3 Feb 2014 19:13:59 +0000 (11:13 -0800)]
dsputil: Move draw_edges() to mpegvideoencdsp

4 years agoMerge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58'
Michael Niedermayer [Sun, 6 Jul 2014 21:43:37 +0000 (23:43 +0200)]
Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58'

* commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58':
  bmv: Split audio and video decoder

Conflicts:
libavcodec/bmvvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/roqvideo: use JPEG color range
Eric Lasota [Sun, 6 Jul 2014 19:42:43 +0000 (15:42 -0400)]
avcodec/roqvideo: use JPEG color range

Signed-off-by: ejlasota <ejlasota@gmail.com>
Also update fate test checksums
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc
Diego Biurrun [Mon, 30 Dec 2013 18:56:07 +0000 (19:56 +0100)]
dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc

4 years agodsputil: Split off *_8x8basis to a separate context
Diego Biurrun [Mon, 30 Dec 2013 18:19:39 +0000 (19:19 +0100)]
dsputil: Split off *_8x8basis to a separate context

4 years agoswresample: organize functions into doxy groups
Timothy Gu [Sun, 6 Jul 2014 16:53:56 +0000 (09:53 -0700)]
swresample: organize functions into doxy groups

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample: better doxy for configuration-returning functions
Timothy Gu [Sun, 6 Jul 2014 16:53:54 +0000 (09:53 -0700)]
swresample: better doxy for configuration-returning functions

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample: improve Doxygen introduction
Timothy Gu [Sun, 6 Jul 2014 16:53:55 +0000 (09:53 -0700)]
swresample: improve Doxygen introduction

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample: add SwrContext doxy
Timothy Gu [Sun, 6 Jul 2014 16:53:53 +0000 (09:53 -0700)]
swresample: add SwrContext doxy

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample: add SwrDitherType doxy
Timothy Gu [Sun, 6 Jul 2014 16:53:52 +0000 (09:53 -0700)]
swresample: add SwrDitherType doxy

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample: group all the option constants in a section in doxy
Timothy Gu [Sun, 6 Jul 2014 16:53:51 +0000 (09:53 -0700)]
swresample: group all the option constants in a section in doxy

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample: grammar/capitalization fixes
Timothy Gu [Sun, 6 Jul 2014 16:53:50 +0000 (09:53 -0700)]
swresample: grammar/capitalization fixes

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil: actually install hash.h
Timothy Gu [Sun, 6 Jul 2014 15:51:12 +0000 (08:51 -0700)]
avutil: actually install hash.h

This header is designed as a public header (with APIchanges entry and
everything), but it is forgotten to put into the headers to be installed
list.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoaudio_fifo: Split into a separate doxygen module
Timothy Gu [Sun, 6 Jul 2014 17:54:17 +0000 (10:54 -0700)]
audio_fifo: Split into a separate doxygen module

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agosamplefmt: Add doxygen categories
Timothy Gu [Sun, 6 Jul 2014 17:53:33 +0000 (10:53 -0700)]
samplefmt: Add doxygen categories

Categorize the enum and functions as "audio-related".

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agox86/svq1enc: use unaligned mov on SSE2
James Almer [Sun, 6 Jul 2014 16:14:32 +0000 (13:14 -0300)]
x86/svq1enc: use unaligned mov on SSE2

Might fix fate failures on some systems

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodsicin: Split audio and video decoder
Nidhi Makhijani [Sun, 6 Jul 2014 13:45:52 +0000 (19:15 +0530)]
dsicin: Split audio and video decoder

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agoMerge commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3'
Michael Niedermayer [Sun, 6 Jul 2014 18:11:40 +0000 (20:11 +0200)]
Merge commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3'

* commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3':
  paf: split audio and video decoder

Conflicts:
libavcodec/pafvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '373a6dda5422186bc057297342a9e559a564595e'
Michael Niedermayer [Sun, 6 Jul 2014 17:58:47 +0000 (19:58 +0200)]
Merge commit '373a6dda5422186bc057297342a9e559a564595e'

* commit '373a6dda5422186bc057297342a9e559a564595e':
  cljr: split decoder and encoder

Conflicts:
libavcodec/Makefile
libavcodec/cljrdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agobmv: Split audio and video decoder
Nidhi Makhijani [Sun, 6 Jul 2014 14:03:49 +0000 (19:33 +0530)]
bmv: Split audio and video decoder

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agoMerge commit '02a7a5e330ec4373a761f63c292220a1de13b968'
Michael Niedermayer [Sun, 6 Jul 2014 17:42:33 +0000 (19:42 +0200)]
Merge commit '02a7a5e330ec4373a761f63c292220a1de13b968'

* commit '02a7a5e330ec4373a761f63c292220a1de13b968':
  vc1test: Check malloc call

Conflicts:
libavformat/vc1test.c

See: a807c68253b02cce8b9fbc87d7857c31d531a1ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '77fc7b76726719746ca45df6c4a62c41abad506e'
Michael Niedermayer [Sun, 6 Jul 2014 17:24:57 +0000 (19:24 +0200)]
Merge commit '77fc7b76726719746ca45df6c4a62c41abad506e'

* commit '77fc7b76726719746ca45df6c4a62c41abad506e':
  vc1test: Return proper error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>