ffmpeg.git
6 years agoavformat/img2dec: enable generic seeking for image pipes
Michael Niedermayer [Thu, 25 Sep 2014 15:07:04 +0000 (17:07 +0200)]
avformat/img2dec: enable generic seeking for image pipes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/img2dec: initialize pkt->pos for image pipes
Michael Niedermayer [Thu, 25 Sep 2014 15:06:33 +0000 (17:06 +0200)]
avformat/img2dec: initialize pkt->pos for image pipes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/img2dec: pass error code and signal EOF
Michael Niedermayer [Thu, 25 Sep 2014 14:17:08 +0000 (16:17 +0200)]
avformat/img2dec: pass error code and signal EOF

Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/img2dec: fix error code at EOF for pipes
Michael Niedermayer [Thu, 25 Sep 2014 13:12:27 +0000 (15:12 +0200)]
avformat/img2dec: fix error code at EOF for pipes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4620affa24eedb167482198aa04126bcedd05620'
Michael Niedermayer [Thu, 25 Sep 2014 12:02:55 +0000 (14:02 +0200)]
Merge commit '4620affa24eedb167482198aa04126bcedd05620'

* commit '4620affa24eedb167482198aa04126bcedd05620':
  m4vdec: K&R formatting cosmetics

Conflicts:
libavformat/m4vdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5'
Michael Niedermayer [Thu, 25 Sep 2014 11:51:43 +0000 (13:51 +0200)]
Merge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5'

* commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5':
  lmlm4: K&R formatting cosmetics

Conflicts:
libavformat/lmlm4.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b'
Michael Niedermayer [Thu, 25 Sep 2014 11:45:25 +0000 (13:45 +0200)]
Merge commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b'

* commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b':
  concat: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '28f5cd312c9da9072108edf8b7685d009374ea96'
Michael Niedermayer [Thu, 25 Sep 2014 11:10:00 +0000 (13:10 +0200)]
Merge commit '28f5cd312c9da9072108edf8b7685d009374ea96'

* commit '28f5cd312c9da9072108edf8b7685d009374ea96':
  fate: Switch ra4-288 test from framecrc() to pcm()

Conflicts:
tests/fate/real.mak

The test is kept disabled as it still does not pass on x86-64 due to float
rounding

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d'
Michael Niedermayer [Thu, 25 Sep 2014 10:09:09 +0000 (12:09 +0200)]
Merge commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d'

* commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d':
  avcodec: Fix a doxy comment to refer to the right function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agom4vdec: K&R formatting cosmetics
Gabriel Dume [Tue, 23 Sep 2014 14:29:59 +0000 (10:29 -0400)]
m4vdec: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agolmlm4: K&R formatting cosmetics
Gabriel Dume [Tue, 23 Sep 2014 14:29:58 +0000 (10:29 -0400)]
lmlm4: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoconcat: K&R formatting cosmetics
Gabriel Dume [Tue, 23 Sep 2014 14:29:57 +0000 (10:29 -0400)]
concat: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agofate: Switch ra4-288 test from framecrc() to pcm()
Katerina Barone-Adesi [Wed, 24 Sep 2014 11:51:54 +0000 (13:51 +0200)]
fate: Switch ra4-288 test from framecrc() to pcm()

The decoder is float-based and the test needs to allow for some fuzz.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoavcodec: Fix a doxy comment to refer to the right function
Martin Storsjö [Wed, 24 Sep 2014 20:31:43 +0000 (23:31 +0300)]
avcodec: Fix a doxy comment to refer to the right function

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavcodec/mpegvideo_enc: write a log message at verbose level if frame re-encoding...
Michael Niedermayer [Thu, 25 Sep 2014 02:28:21 +0000 (04:28 +0200)]
avcodec/mpegvideo_enc: write a log message at verbose level if frame re-encoding occurs due to VBV

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/idctdsp: port {put,add}_pixels_clamped to yasm
James Almer [Wed, 24 Sep 2014 22:53:07 +0000 (19:53 -0300)]
x86/idctdsp: port {put,add}_pixels_clamped to yasm

Also add sse2 versions for both.
put_pixels_clamped port and sse2 version originally written by Timothy Gu.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoavcodec/idctdsp: change {put,add}_pixels_clamped to ptrdiff_t line_size
James Almer [Wed, 24 Sep 2014 22:51:02 +0000 (19:51 -0300)]
avcodec/idctdsp: change {put,add}_pixels_clamped to ptrdiff_t line_size

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoMerge commit '2f172f1ae984b763c06069adb51d0053b3834f4b'
Michael Niedermayer [Wed, 24 Sep 2014 22:53:36 +0000 (00:53 +0200)]
Merge commit '2f172f1ae984b763c06069adb51d0053b3834f4b'

* commit '2f172f1ae984b763c06069adb51d0053b3834f4b':
  rtsp: Clear the session id on redirects

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc'
Michael Niedermayer [Wed, 24 Sep 2014 22:15:26 +0000 (00:15 +0200)]
Merge commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc'

* commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc':
  rtpenc: HEVC/H.265 support

Conflicts:
Changelog
libavformat/rtpenc.c
libavformat/rtpenc_hevc.c
libavformat/version.h

See: 6821a5a4adcb40c458356e8bb90416dd8f5dd6b2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95'
Michael Niedermayer [Wed, 24 Sep 2014 22:02:52 +0000 (00:02 +0200)]
Merge commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95'

* commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95':
  libavformat: Move avc mp4 startcode parsing to a shared file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86: use function pointers for {put,add}_pixels_clamped
James Almer [Wed, 24 Sep 2014 18:18:50 +0000 (15:18 -0300)]
avcodec/x86: use function pointers for {put,add}_pixels_clamped

Same behavior as in simple_idct.
This way the best optimized versions available will be used instead.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agolibavutil/opt: fix av_opt_set_channel_layout() to access correct memory address
Philip DeCamp [Wed, 24 Sep 2014 20:15:18 +0000 (16:15 -0400)]
libavutil/opt: fix av_opt_set_channel_layout() to access correct memory address

Signed-off-by: Philip DeCamp <decamp@mit.edu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortsp: Clear the session id on redirects
Martin Storsjö [Wed, 24 Sep 2014 08:31:18 +0000 (11:31 +0300)]
rtsp: Clear the session id on redirects

This fixes handling redirects in case the server provided a session
id within the redirect reply.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpenc: HEVC/H.265 support
Thomas Volkert [Sun, 21 Sep 2014 10:10:42 +0000 (12:10 +0200)]
rtpenc: HEVC/H.265 support

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolibavformat: Move avc mp4 startcode parsing to a shared file
Martin Storsjö [Wed, 24 Sep 2014 08:17:04 +0000 (11:17 +0300)]
libavformat: Move avc mp4 startcode parsing to a shared file

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agox86/videodsp: add ff_emu_edge_{hfix,hvar}_avx2
James Almer [Tue, 23 Sep 2014 21:42:35 +0000 (18:42 -0300)]
x86/videodsp: add ff_emu_edge_{hfix,hvar}_avx2

~15% faster than sse2.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agolibavformat/ffmetadec: Make unchanged function arguments const
Michael Niedermayer [Wed, 24 Sep 2014 16:33:55 +0000 (18:33 +0200)]
libavformat/ffmetadec: Make unchanged function arguments const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavformat/dv: Make unchanged function arguments const
Michael Niedermayer [Wed, 24 Sep 2014 16:33:55 +0000 (18:33 +0200)]
libavformat/dv: Make unchanged function arguments const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavformat/avienc: Make unchanged function arguments const
Michael Niedermayer [Wed, 24 Sep 2014 16:33:55 +0000 (18:33 +0200)]
libavformat/avienc: Make unchanged function arguments const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavformat/avidec: Make unchanged function arguments const
Michael Niedermayer [Wed, 24 Sep 2014 16:33:55 +0000 (18:33 +0200)]
libavformat/avidec: Make unchanged function arguments const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c463dfc7e49929a9891884312b23b27d14729c51'
Michael Niedermayer [Wed, 24 Sep 2014 15:25:31 +0000 (17:25 +0200)]
Merge commit 'c463dfc7e49929a9891884312b23b27d14729c51'

* commit 'c463dfc7e49929a9891884312b23b27d14729c51':
  rtpdec_hevc: Drop a duplicated, nonstandard entry

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/APIchanges: fix typo
Michael Niedermayer [Wed, 24 Sep 2014 15:14:56 +0000 (17:14 +0200)]
doc/APIchanges: fix typo

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopostproc: add basic deblock filter visualization support
Michael Niedermayer [Fri, 19 Sep 2014 13:21:36 +0000 (15:21 +0200)]
postproc: add basic deblock filter visualization support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: use av_codec_get_pkt_timebase()
Michael Niedermayer [Wed, 24 Sep 2014 03:47:36 +0000 (05:47 +0200)]
ffplay: use av_codec_get_pkt_timebase()

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortpdec_hevc: Drop a duplicated, nonstandard entry
Vittorio Giovara [Wed, 17 Sep 2014 12:27:32 +0000 (13:27 +0100)]
rtpdec_hevc: Drop a duplicated, nonstandard entry

The RFC spec draft only specifies the "H265" name - there is no
specification saying how to interpret "HEVC" (if such a packet
format is specified it could be an entirely different format).

Since this is a very new standard (still a draft), there is little
need for compatibility with existing, broken implementations. Therefore
remove the extra alias, to avoid the risk of encouraging incorrect
usage.

Intentionally keeping the ff_hevc_dynamic_handler name for the
handler, to use "hevc" consistently as name for the codec instead
of "h265" within the library internals as long as there only is one
single variant in actual use.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoconfigure: Check if "-D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600" is needed for...
Michael Niedermayer [Wed, 24 Sep 2014 03:04:24 +0000 (05:04 +0200)]
configure: Check if "-D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600" is needed for localtime_r()

Fixes build with musl

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: fail if SDL is unavailable and --enable-sdl is specified
Michael Niedermayer [Tue, 23 Sep 2014 00:20:25 +0000 (02:20 +0200)]
configure: fail if SDL is unavailable and --enable-sdl is specified

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: reindent the --disable-sdl related code
Michael Niedermayer [Tue, 23 Sep 2014 00:08:55 +0000 (02:08 +0200)]
configure: reindent the --disable-sdl related code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: support --disable-sdl
Michael Niedermayer [Mon, 22 Sep 2014 20:13:22 +0000 (22:13 +0200)]
configure: support --disable-sdl

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: move intermediate bidir buffer
Christophe Gisquet [Tue, 23 Sep 2014 21:36:42 +0000 (21:36 +0000)]
hevc: move intermediate bidir buffer

Other buffers are already there.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: remove unneeded buffer.
Christophe Gisquet [Tue, 23 Sep 2014 21:36:40 +0000 (21:36 +0000)]
hevc: remove unneeded buffer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/videodsp: fix warning about discarded 'const' qualifier
James Almer [Tue, 23 Sep 2014 21:29:21 +0000 (18:29 -0300)]
x86/videodsp: fix warning about discarded 'const' qualifier

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoavcodec/libvpxdec: don't check for formats other than i420 when vp9 decoding is disabled
James Almer [Tue, 23 Sep 2014 22:30:58 +0000 (19:30 -0300)]
avcodec/libvpxdec: don't check for formats other than i420 when vp9 decoding is disabled

Should fix ticket #3958.

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agotests/fate-run.sh: Cat .err file in case of error with V>0
Michael Niedermayer [Tue, 23 Sep 2014 21:38:29 +0000 (23:38 +0200)]
tests/fate-run.sh: Cat .err file in case of error with V>0

This may make fate failures where only the console output is available
easier to analyze

Suggested-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoSkip decklink_common_c.h when running make checkheaders.
Carl Eugen Hoyos [Tue, 23 Sep 2014 20:51:36 +0000 (22:51 +0200)]
Skip decklink_common_c.h when running make checkheaders.

6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Tue, 23 Sep 2014 20:09:50 +0000 (22:09 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: move pts calculating code to generic decoder
  ffplay: factorize decoder functions to generic decoder
  ffplay: handle fullscreen status on resize event

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix compile error on arm4/arm5 platform
Bernd Kuhls [Tue, 23 Sep 2014 18:10:03 +0000 (20:10 +0200)]
Fix compile error on arm4/arm5 platform

Since these commits
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8

compilation on arm4/arm5 fails:

libavcodec/libavcodec.so: undefined reference to
`ff_startcode_find_candidate_armv6'

Because libavcodec/arm/Makefile contains
ARMV6-OBJS-$(CONFIG_STARTCODE)         += arm/startcode_armv6.o
function ff_startcode_find_candidate_armv6 is not included for older ARM
archs. The bug was found during automatic buildroot builds:

http://autobuild.buildroot.net/results/ec7/ec71e4f16ee9106747dff5f15999cbd17903e76f//build-end.log
Quote from configure summary:
ARCH                      arm (armv4t)
big-endian                no
runtime cpu detection     yes
ARMv5TE enabled           no
ARMv6 enabled             no
ARMv6T2 enabled           no

http://autobuild.buildroot.net/results/be7/be72eb182eaccf0064a32c9dfc2ac1c0d6555506/build-end.log
ARCH                      arm (armv5te)
big-endian                no
runtime cpu detection     yes
ARMv5TE enabled           yes
ARMv6 enabled             no
ARMv6T2 enabled           no

This patch provides the necessary #if clauses as discussed with Michael:
https://ffmpeg.org/pipermail/ffmpeg-devel/2014-September/163329.html

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: move pts calculating code to generic decoder
Marton Balint [Wed, 3 Sep 2014 23:59:34 +0000 (01:59 +0200)]
ffplay: move pts calculating code to generic decoder

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: factorize decoder functions to generic decoder
Marton Balint [Sat, 13 Jul 2013 13:16:15 +0000 (15:16 +0200)]
ffplay: factorize decoder functions to generic decoder

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: handle fullscreen status on resize event
Marton Balint [Mon, 22 Sep 2014 20:17:06 +0000 (22:17 +0200)]
ffplay: handle fullscreen status on resize event

In some cases resize events can happen even during fullscreen, so let's pass
the proper flag to SDL_SetVideoMode.

Fixes ticket #3964.

Reported-by: Jeff Dwork <jeff@reggie.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoavformat/riffenc: Filter out "BottomUp" in ff_put_bmp_header()
Benoit Fouet [Tue, 23 Sep 2014 08:07:10 +0000 (10:07 +0200)]
avformat/riffenc: Filter out "BottomUp" in ff_put_bmp_header()

Fixes Ticket1304

Commit message and extradata size bugfix by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/webp: fix default palette color 0xff000000 -> 0x00000000
Pascal Massimino [Mon, 22 Sep 2014 21:48:57 +0000 (14:48 -0700)]
avcodec/webp: fix default palette color 0xff000000 -> 0x00000000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/asvenc: fix AAN scaling
Michael Niedermayer [Tue, 23 Sep 2014 13:55:24 +0000 (15:55 +0200)]
avcodec/asvenc: fix AAN scaling

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/asvenc: Fix integer overflow in level
Michael Niedermayer [Tue, 23 Sep 2014 13:46:52 +0000 (15:46 +0200)]
avcodec/asvenc: Fix integer overflow in level

Warn if the qscale is too low for the input data and clip levels to
minimize artifacts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/vp9: add AVX and AVX2 MC
James Almer [Tue, 23 Sep 2014 00:55:13 +0000 (21:55 -0300)]
x86/vp9: add AVX and AVX2 MC

Roughly 25% faster MC than ssse3 for blocksizes 32 and 64.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoffmpeg: replace impossible dts/pts combinations by a reasonable guess instead of...
Michael Niedermayer [Mon, 22 Sep 2014 23:06:30 +0000 (01:06 +0200)]
ffmpeg: replace impossible dts/pts combinations by a reasonable guess instead of hard failing

Fixes stream copy from tserror270.ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/decoders: adding documentation for lavc/dvdsubdec.c option "forced_subs_only"
Nicholas Robbins [Mon, 22 Sep 2014 19:31:35 +0000 (15:31 -0400)]
doc/decoders: adding documentation for lavc/dvdsubdec.c option "forced_subs_only"

Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/dvdsubdec: Add option forced_subs_only to only decode forced subtitle...
Nicholas Robbins [Sat, 20 Sep 2014 11:53:44 +0000 (07:53 -0400)]
libavcodec/dvdsubdec: Add option forced_subs_only to only decode forced subtitle frames.

Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/asfenc: Make asf_write_indexs index argument const
Michael Niedermayer [Mon, 22 Sep 2014 16:53:44 +0000 (18:53 +0200)]
avformat/asfenc: Make asf_write_indexs index argument const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/adtsenc: buf isnt changed in adts_decode_extradata(), make it const
Michael Niedermayer [Mon, 22 Sep 2014 16:47:14 +0000 (18:47 +0200)]
avformat/adtsenc: buf isnt changed in adts_decode_extradata(), make it const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/4xm: Make src of decode_p_block() const
Michael Niedermayer [Mon, 22 Sep 2014 16:09:28 +0000 (18:09 +0200)]
avcodec/4xm: Make src of decode_p_block() const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snow: Make block argumrnt of ff_snow_pred_block() const
Michael Niedermayer [Mon, 22 Sep 2014 16:06:56 +0000 (18:06 +0200)]
avcodec/snow: Make block argumrnt of ff_snow_pred_block() const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopostproc/postprocess_template: mark unchanged function arguments const
Michael Niedermayer [Mon, 22 Sep 2014 15:49:55 +0000 (17:49 +0200)]
postproc/postprocess_template: mark unchanged function arguments const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopostprocess: prefetch* dont change anything, thus their arguments should be const
Michael Niedermayer [Mon, 22 Sep 2014 15:42:10 +0000 (17:42 +0200)]
postprocess: prefetch* dont change anything, thus their arguments should be const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRevert "configure: Refactor setting of feature test macro _XOPEN_SOURCE"
Michael Niedermayer [Mon, 22 Sep 2014 15:05:55 +0000 (17:05 +0200)]
Revert "configure: Refactor setting of feature test macro _XOPEN_SOURCE"

This fixes build on netbsd and probably other bsd based Platforms

This reverts commit 56b8d106769c5c5f9174dcc426f1ee2f991428b1.

6 years agoAdd missing entry for maintainer of rtpenc_hevc.*
Thomas Volkert [Mon, 22 Sep 2014 11:07:10 +0000 (13:07 +0200)]
Add missing entry for maintainer of rtpenc_hevc.*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/avidec: ensure that palette does not contain the BottomUp info.
Benoit Fouet [Mon, 22 Sep 2014 07:57:37 +0000 (09:57 +0200)]
avformat/avidec: ensure that palette does not contain the BottomUp info.

Considering the palette is located at the end of extradata may be flawed
when the extradata contains the palette followed by the BottomUp field.
When the BottomUp field is present, exclude it from the palette.
Fixes part of ticket #1304

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/img2: remove useless 'pix' duplicated entry.
Benoit Fouet [Fri, 12 Sep 2014 14:37:26 +0000 (16:37 +0200)]
avformat/img2: remove useless 'pix' duplicated entry.

The second entry will never be selected, so let's save some bytes in the
library.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortpenc_h263_rfc2190: avoid misleading error output
Thomas Volkert [Sun, 21 Sep 2014 15:43:16 +0000 (17:43 +0200)]
rtpenc_h263_rfc2190: avoid misleading error output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavdevice/version: bump minor for the decklink input
Michael Niedermayer [Mon, 22 Sep 2014 01:25:22 +0000 (03:25 +0200)]
avdevice/version: bump minor for the decklink input

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavdevice: add decklink input support
Deti Fliegl [Mon, 22 Sep 2014 00:46:03 +0000 (02:46 +0200)]
avdevice: add decklink input support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavdevice/decklink: move general code of decklink encoder to common file
Deti Fliegl [Sun, 21 Sep 2014 23:39:50 +0000 (01:39 +0200)]
avdevice/decklink: move general code of decklink encoder to common file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Refactor setting of feature test macro _XOPEN_SOURCE
Jörg Krause [Sun, 21 Sep 2014 20:48:01 +0000 (22:48 +0200)]
configure: Refactor setting of feature test macro _XOPEN_SOURCE

Some C libraries, eg glibc, uclibc, and musl, uses feature test macros
to expose definitions conforming to the standards ISO C, POSIX and
extensions. According to which feature test macros are defined by the
user or the compiler, a header file, eg <features.h>, used by these
libraries internally defines various other macros.

glibc and uclibc also defines release test macros, eg __GLIBC__ and
__UCLIBC__ in <features.h>. musl does not have (and does not want) a
macro __MUSL__. Therefore it is not possible to check for the musl
library.

However, building FFmpeg with musl needs the feature test macro
_XOPEN_SOURCE=600 to be defined.

Signed-off-by: Jörg Krause <jkrause@posteo.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/bprint: add const to av_bprint_is_complete() argument.
Nicolas George [Sun, 21 Sep 2014 17:03:33 +0000 (19:03 +0200)]
lavu/bprint: add const to av_bprint_is_complete() argument.

6 years agoavformat/assenc: mux all extradata at once
Clément Bœsch [Sat, 20 Sep 2014 16:39:58 +0000 (18:39 +0200)]
avformat/assenc: mux all extradata at once

Before this commit, the code was muxing up to the 2nd line after
"[Events]" (assuming it to be the "Format:" line). The remaining are
generally "Comment:" directives which can stay in that place. mkvextract
behaves that way so it seems there is no reason for that extra
complexity.

6 years agoavformat/assenc: return correct error code
Clément Bœsch [Sat, 20 Sep 2014 19:39:57 +0000 (21:39 +0200)]
avformat/assenc: return correct error code

6 years agoavcodec/webvttdec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 20:20:05 +0000 (22:20 +0200)]
avcodec/webvttdec: add some memory checks

6 years agoavcodec/textdec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 20:18:50 +0000 (22:18 +0200)]
avcodec/textdec: add some memory checks

6 years agoavcodec/subviewerdec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 20:17:29 +0000 (22:17 +0200)]
avcodec/subviewerdec: add some memory checks

6 years agoavcodec/srtdec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 20:14:11 +0000 (22:14 +0200)]
avcodec/srtdec: add some memory checks

6 years agoavcodec/samidec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 20:11:34 +0000 (22:11 +0200)]
avcodec/samidec: add some memory checks

6 years agoavcodec/realtextdec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 20:11:45 +0000 (22:11 +0200)]
avcodec/realtextdec: add some memory checks

6 years agoavcodec/mpl2dec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 20:02:26 +0000 (22:02 +0200)]
avcodec/mpl2dec: add some memory checks

6 years agoavcodec/movtextdec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 20:00:21 +0000 (22:00 +0200)]
avcodec/movtextdec: add some memory checks

6 years agoavcodec/microdvddec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 19:58:27 +0000 (21:58 +0200)]
avcodec/microdvddec: add some memory checks

6 years agoavcodec/jacosubdec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 19:48:13 +0000 (21:48 +0200)]
avcodec/jacosubdec: add some memory checks

6 years agoavcodec/ass: add ff_ass_add_rect_bprint() helper
Clément Bœsch [Sun, 21 Sep 2014 16:36:11 +0000 (18:36 +0200)]
avcodec/ass: add ff_ass_add_rect_bprint() helper

6 years agortpdec_hevc: do not print an error message if the received packet has a valid header...
Thomas Volkert [Sun, 21 Sep 2014 11:50:12 +0000 (13:50 +0200)]
rtpdec_hevc: do not print an error message if the received packet has a valid header but lacks additional bytes as payload

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mp3dec: avoid early EOF with concatenated gapless mp3s
wm4 [Sun, 21 Sep 2014 10:51:41 +0000 (12:51 +0200)]
avformat/mp3dec: avoid early EOF with concatenated gapless mp3s

Consider a file created with something like:

    cat file1.mp3 file2.mp3 > result.mp3

Then if file2.mp3 has gapless information, result.mp3 would stop playing
something in the middle. This happens because the gapless info directs
the decoder to discard all samples after a certain position. To make
matters worse, the gapless info of file2.mp3 will be used when playing
the file1.mp3 part, because the gapless info is located at the end of
the file.

While handling concatenated gapless files correctly would be insane and
a lot of effort (especially without scanning the whole file on opening),
it's easy to prevent at least early EOF. Playback will happen to work,
even if it's slightly broken.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomlpdec: support TrueHD streams with an Atmos substream
Hendrik Leppkes [Sun, 21 Sep 2014 00:29:28 +0000 (02:29 +0200)]
mlpdec: support TrueHD streams with an Atmos substream

The fourth substream is being discarded, since its not raw audio data,
but an encoded Atmos stream which needs a specialized decoder.

Fixes decoding of the true hd stream from Transformers\ -\ Age\ of\ Extinction\ 2014\ 1080P-003.mkv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomlpdec: support major sync headers with optional extension blocks
Hendrik Leppkes [Sun, 21 Sep 2014 00:29:27 +0000 (02:29 +0200)]
mlpdec: support major sync headers with optional extension blocks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortpenc: HEVC/H.265 support
Thomas Volkert [Sun, 21 Sep 2014 10:10:42 +0000 (12:10 +0200)]
rtpenc: HEVC/H.265 support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_scale: Allow chroma samples to be above and to the left of luma samples
Michael Niedermayer [Sun, 21 Sep 2014 10:12:50 +0000 (12:12 +0200)]
avfilter/vf_scale: Allow chroma samples to be above and to the left of luma samples

Found-by: Kierank
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale: Allow chroma samples to be above and to the left of luma samples
Michael Niedermayer [Sun, 21 Sep 2014 10:12:50 +0000 (12:12 +0200)]
swscale: Allow chroma samples to be above and to the left of luma samples

Found-by: Kierank
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '103391ca90b2f7c56ae756d76c76f7c3dfa28dd4'
Michael Niedermayer [Sun, 21 Sep 2014 09:50:41 +0000 (11:50 +0200)]
Merge commit '103391ca90b2f7c56ae756d76c76f7c3dfa28dd4'

* commit '103391ca90b2f7c56ae756d76c76f7c3dfa28dd4':
  dca: Remove some commented-out cruft

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/alacenc: Remove unused variable
Michael Niedermayer [Sat, 20 Sep 2014 21:54:00 +0000 (23:54 +0200)]
avcodec/alacenc: Remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoalacenc: remove unneeded masking
Christophe Gisquet [Sat, 20 Sep 2014 18:23:09 +0000 (18:23 +0000)]
alacenc: remove unneeded masking

The extra bits have already been masked, so this was not doing anything.

Noticed-by: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoalacenc: fix incorrect buffer use
Christophe Gisquet [Sat, 20 Sep 2014 18:23:08 +0000 (18:23 +0000)]
alacenc: fix incorrect buffer use

The issue lies in actually dead code ("for now it's not used").

Noticed-by: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mp3dec: fix gapless audio support
wm4 [Sat, 20 Sep 2014 11:48:05 +0000 (13:48 +0200)]
avformat/mp3dec: fix gapless audio support

The code already had skipping of initial padding, but discarding
trailing frame padding was missing.

This is somewhat questionable, because it will make the decoder discard
any data after the declared file size in the LAME header. But note that
skipping full frames at the end of the stream is required. Encoders
actually create such files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodca: Remove some commented-out cruft
Diego Biurrun [Fri, 19 Sep 2014 22:21:12 +0000 (00:21 +0200)]
dca: Remove some commented-out cruft