ffmpeg.git
5 years agoMerge commit '4b95e95dbae58c9b60891284bf8b5bbd83e5293a'
Michael Niedermayer [Tue, 27 Jan 2015 13:03:00 +0000 (14:03 +0100)]
Merge commit '4b95e95dbae58c9b60891284bf8b5bbd83e5293a'

* commit '4b95e95dbae58c9b60891284bf8b5bbd83e5293a':
  hevc: store the short term rps flag and size in the context

See: 06894f1a04dda384ab3632b2342f0f97ec9ebed9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '36779a84051eae6744cc936d91b1d428143665ba'
Michael Niedermayer [Tue, 27 Jan 2015 12:55:38 +0000 (13:55 +0100)]
Merge commit '36779a84051eae6744cc936d91b1d428143665ba'

* commit '36779a84051eae6744cc936d91b1d428143665ba':
  hevc: store the escaped/raw bitstream in HEVCNAL

See: 2af82a1ad9f788ec3c1d22e15423996a4b161934
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2'
Michael Niedermayer [Tue, 27 Jan 2015 12:54:49 +0000 (13:54 +0100)]
Merge commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2'

* commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2':
  hevc: pass the full HEVCNAL struct to decode_nal_unit

Conflicts:
libavcodec/hevc.c

See: 77140279d33006f1d949ee3717af67204dc519c6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3a70c0c95feacb3844d05eebd579fc8189a77eee'
Michael Niedermayer [Tue, 27 Jan 2015 12:35:27 +0000 (13:35 +0100)]
Merge commit '3a70c0c95feacb3844d05eebd579fc8189a77eee'

* commit '3a70c0c95feacb3844d05eebd579fc8189a77eee':
  examples/transcode_aac: generate proper PTS and set the muxer timebase

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e'
Michael Niedermayer [Tue, 27 Jan 2015 12:29:42 +0000 (13:29 +0100)]
Merge commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e'

* commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e':
  examples/transcode_aac: fix a typo

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761'
Michael Niedermayer [Tue, 27 Jan 2015 12:20:54 +0000 (13:20 +0100)]
Merge commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761'

* commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761':
  examples/transcode_aac: properly select the output sample format

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '443b71928b2f36362e805c037751e6c3c79ea4e8'
Michael Niedermayer [Tue, 27 Jan 2015 12:15:06 +0000 (13:15 +0100)]
Merge commit '443b71928b2f36362e805c037751e6c3c79ea4e8'

* commit '443b71928b2f36362e805c037751e6c3c79ea4e8':
  hevc: unref the current frame if frame_start() fails

Conflicts:
libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1dd021929f8157b88529ce1e6ab6351dd2899e89'
Michael Niedermayer [Tue, 27 Jan 2015 12:02:20 +0000 (13:02 +0100)]
Merge commit '1dd021929f8157b88529ce1e6ab6351dd2899e89'

* commit '1dd021929f8157b88529ce1e6ab6351dd2899e89':
  hevc: clear unused refs on failure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f9f883af4fe615a832407a657752e248a96c6280'
Michael Niedermayer [Tue, 27 Jan 2015 11:55:21 +0000 (12:55 +0100)]
Merge commit 'f9f883af4fe615a832407a657752e248a96c6280'

* commit 'f9f883af4fe615a832407a657752e248a96c6280':
  h264: simplify code in flush_dpb()

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_dxva2: add hevc support
Hendrik Leppkes [Sun, 25 Jan 2015 12:01:12 +0000 (13:01 +0100)]
ffmpeg_dxva2: add hevc support

Reviewed-by: compn <tempn@mi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdd DXVA2 HEVC HWAccel
Hendrik Leppkes [Sun, 25 Jan 2015 12:01:11 +0000 (13:01 +0100)]
Add DXVA2 HEVC HWAccel

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: reindent after previous commit
Hendrik Leppkes [Sun, 25 Jan 2015 12:01:10 +0000 (13:01 +0100)]
hevc: reindent after previous commit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: add hwaccel hooks
Hendrik Leppkes [Sun, 25 Jan 2015 12:01:09 +0000 (13:01 +0100)]
hevc: add hwaccel hooks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: store the short term rps flag and size in the context
Hendrik Leppkes [Sun, 25 Jan 2015 12:01:08 +0000 (13:01 +0100)]
hevc: store the short term rps flag and size in the context

For future use by hardware accelerators.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: store the escaped/raw bitstream in HEVCNAL
Hendrik Leppkes [Sun, 25 Jan 2015 12:01:07 +0000 (13:01 +0100)]
hevc: store the escaped/raw bitstream in HEVCNAL

Hardware Accelerators require access to the escaped bitstream.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi/lut: apply minor compute_gammaval709() doxy fix
Stefano Sabatini [Tue, 27 Jan 2015 10:22:45 +0000 (11:22 +0100)]
lavfi/lut: apply minor compute_gammaval709() doxy fix

5 years agohevc: store the short term rps flag and size in the context
Hendrik Leppkes [Sun, 25 Jan 2015 11:58:47 +0000 (12:58 +0100)]
hevc: store the short term rps flag and size in the context

For future use by hardware accelerators.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohevc: store the escaped/raw bitstream in HEVCNAL
Hendrik Leppkes [Sun, 25 Jan 2015 11:58:46 +0000 (12:58 +0100)]
hevc: store the escaped/raw bitstream in HEVCNAL

Hardware Accelerators require access to the escaped bitstream.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohevc: pass the full HEVCNAL struct to decode_nal_unit
Hendrik Leppkes [Sun, 25 Jan 2015 11:58:45 +0000 (12:58 +0100)]
hevc: pass the full HEVCNAL struct to decode_nal_unit

This enables decode_nal_unit to access additional fields added in
subsequent commits.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoexamples/transcode_aac: generate proper PTS and set the muxer timebase
Andreas Unterweger [Tue, 27 Jan 2015 08:03:08 +0000 (09:03 +0100)]
examples/transcode_aac: generate proper PTS and set the muxer timebase

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoexamples/transcode_aac: fix a typo
Andreas Unterweger [Tue, 27 Jan 2015 08:00:23 +0000 (09:00 +0100)]
examples/transcode_aac: fix a typo

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoexamples/transcode_aac: properly select the output sample format
Andreas Unterweger [Tue, 27 Jan 2015 07:58:47 +0000 (08:58 +0100)]
examples/transcode_aac: properly select the output sample format

Makes the example work with all the supported AAC encoders.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohevc: unref the current frame if frame_start() fails
Anton Khirnov [Thu, 20 Nov 2014 08:41:56 +0000 (09:41 +0100)]
hevc: unref the current frame if frame_start() fails

Prevents DPB from filling up with damaged input.

5 years agohevc: clear unused refs on failure
Anton Khirnov [Thu, 20 Nov 2014 08:26:35 +0000 (09:26 +0100)]
hevc: clear unused refs on failure

5 years agoh264: simplify code in flush_dpb()
Anton Khirnov [Thu, 20 Nov 2014 06:40:34 +0000 (07:40 +0100)]
h264: simplify code in flush_dpb()

There is no point in clearing reference explicitly, since that will be
done as a part of ff_h264_unref_picture() right below.

5 years agofate: Fix bitexactness for vsynth3-dnxhd-1080i-colr
Michael Niedermayer [Tue, 27 Jan 2015 02:41:42 +0000 (03:41 +0100)]
fate: Fix bitexactness for vsynth3-dnxhd-1080i-colr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_eq: mark src as const
Michael Niedermayer [Tue, 27 Jan 2015 00:46:08 +0000 (01:46 +0100)]
avfilter/vf_eq: mark src as const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: use ar and ranlib in deterministic mode if available
Andreas Cadhalpun [Mon, 26 Jan 2015 22:50:29 +0000 (23:50 +0100)]
configure: use ar and ranlib in deterministic mode if available

this makes the static libraries binary reproducible

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_eq: Fix clipping code
Michael Niedermayer [Mon, 26 Jan 2015 22:46:44 +0000 (23:46 +0100)]
avfilter/vf_eq: Fix clipping code

Found-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "configure: use ar and ranlib in deterministic mode"
Michael Niedermayer [Mon, 26 Jan 2015 22:02:01 +0000 (23:02 +0100)]
Revert "configure: use ar and ranlib in deterministic mode"

This breaks on BSDs

This reverts commit 7e857cd57108358531b62ba58daa79adf21878e5.

5 years agoconfigure: use ar and ranlib in deterministic mode
Andreas Cadhalpun [Wed, 21 Jan 2015 21:32:58 +0000 (22:32 +0100)]
configure: use ar and ranlib in deterministic mode

this makes the static libraries binary reproducible

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/movenc: Add simplistic 'colr' tag writing support to mov container
Kevin Wheatley [Mon, 26 Jan 2015 15:39:24 +0000 (16:39 +0100)]
avformat/movenc: Add simplistic 'colr' tag writing support to mov container

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotools/crypto_bench: add Camellia support
James Almer [Mon, 26 Jan 2015 01:56:29 +0000 (22:56 -0300)]
tools/crypto_bench: add Camellia support

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavcodec/nvenc: Fix b-frame parameter handling
Timo Rothenpieler [Mon, 26 Jan 2015 12:28:21 +0000 (13:28 +0100)]
avcodec/nvenc: Fix b-frame parameter handling

This should behave similar to x264 and other encoders, as it handles a
gop_size of 0 as Intra-Only, while it's still possible to control how
many B-Frames it inserts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'rdp/dshow_tv_tuner'
Michael Niedermayer [Mon, 26 Jan 2015 13:39:22 +0000 (14:39 +0100)]
Merge remote-tracking branch 'rdp/dshow_tv_tuner'

* rdp/dshow_tv_tuner:
  dshow: tweak logging
  dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once
  dshow: alert as to ramifications of switching crossbar routing
  dshow: add properties dialog for tv tuners

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfitler/vf_fieldmatch: fix typo
Paul B Mahol [Mon, 26 Jan 2015 13:04:53 +0000 (13:04 +0000)]
avfitler/vf_fieldmatch: fix typo

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavfilter/libmpcodecs: remove unused headers
Paul B Mahol [Mon, 26 Jan 2015 12:06:24 +0000 (12:06 +0000)]
avfilter/libmpcodecs: remove unused headers

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoDecode Prores 4444 XQ with the existing Prores decoder.
Carl Eugen Hoyos [Mon, 26 Jan 2015 11:05:14 +0000 (12:05 +0100)]
Decode Prores 4444 XQ with the existing Prores decoder.

The frames are said to contain a higher bit-depth but
users report that our decoder shows visually correct output.
Requested by forum user gregba and Christoph Gerstbauer.

5 years agolavfi/mp: drop mp=eq and mp=eq2
Stefano Sabatini [Mon, 26 Jan 2015 09:29:21 +0000 (10:29 +0100)]
lavfi/mp: drop mp=eq and mp=eq2

mp=eq2 was ported to a native libavfilter filter in commit
4c38e960d0ca81b78dec1589275a5274dde21c8e.

5 years agoavfilter/vf_eq: fix leak of input frame
Paul B Mahol [Mon, 26 Jan 2015 09:43:51 +0000 (09:43 +0000)]
avfilter/vf_eq: fix leak of input frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agodshow: tweak logging
rogerdpack [Mon, 26 Jan 2015 09:03:48 +0000 (02:03 -0700)]
dshow: tweak logging

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
5 years agodshow: crossbar dialog was frequently being displayed twice, split up option so it...
rogerdpack [Mon, 26 Jan 2015 08:29:58 +0000 (01:29 -0700)]
dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
5 years agodshow: alert as to ramifications of switching crossbar routing
rogerdpack [Mon, 26 Jan 2015 08:08:04 +0000 (01:08 -0700)]
dshow: alert as to ramifications of switching crossbar routing

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
5 years agodshow: add properties dialog for tv tuners
rogerdpack [Sun, 25 Jan 2015 02:56:02 +0000 (19:56 -0700)]
dshow: add properties dialog for tv tuners

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
5 years agofate: add Camellia test
James Almer [Mon, 26 Jan 2015 02:00:55 +0000 (23:00 -0300)]
fate: add Camellia test

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoFix creation of ffprobe-test.nut on remote targets.
Carl Eugen Hoyos [Mon, 26 Jan 2015 00:27:38 +0000 (01:27 +0100)]
Fix creation of ffprobe-test.nut on remote targets.

This is not sufficient to run "make fate-ffprobe" on a remote system:
The ffprobe output contains the relative path to the testfile, it is
necessary to run the test from the build directory.
One solution is to use a script like the following as --target-exec:
ssh target "cd /remote/build/directory; $(printf "%q " "$@")"

5 years agoLICENSE.md: add vf_eq
Michael Niedermayer [Sun, 25 Jan 2015 23:36:17 +0000 (00:36 +0100)]
LICENSE.md: add vf_eq

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter: Port mp=eq/eq2 to lavfi
Arwa Arif [Sun, 18 Jan 2015 22:26:48 +0000 (03:56 +0530)]
avfilter: Port mp=eq/eq2 to lavfi

Code adapted from James Darnley's port
Some fixes from Paul B Mahol <onemda@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/sbrdsp: Use different mem moves
Christophe Gisquet [Sun, 25 Jan 2015 21:13:10 +0000 (18:13 -0300)]
x86/sbrdsp: Use different mem moves

Before
2843 decicycles in ff_sbr_autocorrelate_sse3, 262086 runs, 58 skips

After
2693 decicycles in ff_sbr_autocorrelate_sse3, 262117 runs, 27 skips

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agox86/sbrdsp: add ff_sbr_autocorrelate_{sse,sse3}
James Almer [Sun, 25 Jan 2015 21:06:28 +0000 (18:06 -0300)]
x86/sbrdsp: add ff_sbr_autocorrelate_{sse,sse3}

2 to 2.5 times faster.

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavfilter/vf_mcdeint: Set no_bitstream=1
Michael Niedermayer [Sun, 25 Jan 2015 18:00:07 +0000 (19:00 +0100)]
avfilter/vf_mcdeint: Set no_bitstream=1

This avoids unneeded writing of the bitstream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_mcdeint: fix gop_size
Michael Niedermayer [Sun, 25 Jan 2015 15:00:46 +0000 (16:00 +0100)]
avfilter/vf_mcdeint: fix gop_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_uspp: fix gop_size
Michael Niedermayer [Sun, 25 Jan 2015 14:58:28 +0000 (15:58 +0100)]
avfilter/vf_uspp: fix gop_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_uspp: Use FF_CEIL_RSHIFT() correct rounding of odd w/h
Michael Niedermayer [Sun, 25 Jan 2015 14:50:42 +0000 (15:50 +0100)]
avfilter/vf_uspp: Use FF_CEIL_RSHIFT() correct rounding of odd w/h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/movenc: Check failure of allocation of ctts_entries and propagate error
Michael Niedermayer [Sun, 25 Jan 2015 13:32:22 +0000 (14:32 +0100)]
avformat/movenc: Check failure of allocation of ctts_entries and propagate error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/movenc: fix cleanup on insufficient reserved_moov_size
Michael Niedermayer [Sun, 25 Jan 2015 13:28:43 +0000 (14:28 +0100)]
avformat/movenc: fix cleanup on insufficient reserved_moov_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: fill in the remaining missing dates
Michael Niedermayer [Sun, 25 Jan 2015 13:16:31 +0000 (14:16 +0100)]
doc/APIchanges: fill in the remaining missing dates

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: allow overriding and amending AVStream->disposition
Michael Niedermayer [Thu, 8 Jan 2015 21:51:25 +0000 (22:51 +0100)]
ffmpeg: allow overriding and amending AVStream->disposition

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroskadec: Use av_malloc_array() for index_entries
Michael Niedermayer [Sat, 24 Jan 2015 23:26:53 +0000 (00:26 +0100)]
avformat/matroskadec: Use av_malloc_array() for index_entries

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroskadec: Check av_mallocz() return values
Michael Niedermayer [Sat, 24 Jan 2015 23:25:01 +0000 (00:25 +0100)]
avformat/matroskadec: Check av_mallocz() return values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agonvenc: Propagate desired number of reference frames.
Philip Langdale [Sat, 24 Jan 2015 20:52:58 +0000 (12:52 -0800)]
nvenc: Propagate desired number of reference frames.

Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/dshow_crossbar: Avoid mixing declarations and statements
Michael Niedermayer [Sat, 24 Jan 2015 17:44:40 +0000 (18:44 +0100)]
avdevice/dshow_crossbar: Avoid mixing declarations and statements

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: pass the full HEVCNAL struct to decode_nal_unit
Hendrik Leppkes [Sat, 24 Jan 2015 14:26:15 +0000 (15:26 +0100)]
hevc: pass the full HEVCNAL struct to decode_nal_unit

This enables decode_nal_unit to access additional fields added in
subsequent commits.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/pixdesc: rewrite AV_PIX_FMT_FLAG_PSEUDOPAL documentation
Michael Niedermayer [Thu, 15 Jan 2015 19:56:07 +0000 (20:56 +0100)]
avutil/pixdesc: rewrite AV_PIX_FMT_FLAG_PSEUDOPAL documentation

It seems many people do not understand its current documentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: Fill in remaining missing hashes
Michael Niedermayer [Sat, 24 Jan 2015 12:18:15 +0000 (13:18 +0100)]
doc/APIchanges: Fill in remaining missing hashes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_opt: expand format for strftime
Christophe Gisquet [Tue, 20 Jan 2015 21:33:00 +0000 (22:33 +0100)]
ffmpeg_opt: expand format for strftime

While the shortened format specifiers are valid C99 ones, they are
not supported by e.g. some Visual Studio runtimes (and thus mingw).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffserver: reflow find_stream_in_feed()
Reynaldo H. Verdejo Pinochet [Sat, 24 Jan 2015 04:56:18 +0000 (01:56 -0300)]
ffserver: reflow find_stream_in_feed()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoffserver: reindent handle_connection()
Reynaldo H. Verdejo Pinochet [Sat, 24 Jan 2015 04:44:23 +0000 (01:44 -0300)]
ffserver: reindent handle_connection()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoffserver: reflow handle_connection()
Reynaldo H. Verdejo Pinochet [Sat, 24 Jan 2015 04:35:39 +0000 (01:35 -0300)]
ffserver: reflow handle_connection()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoffserver: reindent http_vlog()
Reynaldo H. Verdejo Pinochet [Sat, 24 Jan 2015 04:11:58 +0000 (01:11 -0300)]
ffserver: reindent http_vlog()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoffserver: reflow http_vlog()
Reynaldo H. Verdejo Pinochet [Sat, 24 Jan 2015 04:10:35 +0000 (01:10 -0300)]
ffserver: reflow http_vlog()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agolavc/libopenjpegenc: move opj_setup_encoder to libopenjpeg_encode_frame
Jean First [Fri, 23 Jan 2015 20:58:41 +0000 (21:58 +0100)]
lavc/libopenjpegenc: move opj_setup_encoder to libopenjpeg_encode_frame

if the openjpeg parameter tcp_rates is not 0 ( using the ffmpeg compression_level option )
every 2nd image per thread is badly encoded. By moving the opj_setup_encoder function from
libopenjpeg_encode_init to libopenjpeg_encode_frame this can be prevented.

This fixes ticket #3754.

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'rdp/dshow_crossbar'
Michael Niedermayer [Fri, 23 Jan 2015 22:44:57 +0000 (23:44 +0100)]
Merge remote-tracking branch 'rdp/dshow_crossbar'

* rdp/dshow_crossbar:
  dshow: fix docu escapes
  dshow: some devices only list themselves under "Video sources" but actually have both video and audio output pins, so make the audio pins accessible by video source name.
  dshow: add options for allowing filter popup configuration dialogs to be presented to the user
  dshow: introduce support for crossbar [multiple input selectable] devices
  dshow: drop initial audio packets with weird timestamps
  dshow: use non deprecated api
  dshow: miscellaneous tweaks
  dshow: allow selecting devices by an alternative name (workaround for devices with symbols in them), allow specifying capture pins by name and alternative (unique) name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3a6dfec864d569c2d0a875e1a7466f51b00edb63'
Michael Niedermayer [Fri, 23 Jan 2015 21:53:25 +0000 (22:53 +0100)]
Merge commit '3a6dfec864d569c2d0a875e1a7466f51b00edb63'

* commit '3a6dfec864d569c2d0a875e1a7466f51b00edb63':
  segment: Check av_get_frame_filename() return value

Conflicts:
libavformat/segment.c

No changes as there was no unchecked av_get_frame_filename() in segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4'
Michael Niedermayer [Fri, 23 Jan 2015 21:27:42 +0000 (22:27 +0100)]
Merge commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4'

* commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4':
  hlsproto: Properly close avio buffer in case of error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4c5fa628da099dbb598c93bc4555b8733d2c3035'
Michael Niedermayer [Fri, 23 Jan 2015 21:19:21 +0000 (22:19 +0100)]
Merge commit '4c5fa628da099dbb598c93bc4555b8733d2c3035'

* commit '4c5fa628da099dbb598c93bc4555b8733d2c3035':
  mov: Do not compute negative SAR values

Conflicts:
libavformat/mov.c

See: e32b07aea4981719a3e6ce92491349c9547958e1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf'
Michael Niedermayer [Fri, 23 Jan 2015 20:59:18 +0000 (21:59 +0100)]
Merge commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf'

* commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf':
  mpegvideo_enc: Draw edges on input for non-multiple of 16 resolutions

Conflicts:
libavcodec/mpegvideo_enc.c

See: 1e78679768b3a1ef336c5b52aa5027d8a50fcf0d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/dv: check av_malloc() return code
Michael Niedermayer [Fri, 23 Jan 2015 17:15:43 +0000 (18:15 +0100)]
avformat/dv: check av_malloc() return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/librtmp: Fix build with --disable-network --enable-librtmp
Michael Niedermayer [Fri, 23 Jan 2015 16:45:35 +0000 (17:45 +0100)]
avformat/librtmp: Fix build with --disable-network --enable-librtmp

Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodshow: fix docu escapes
rogerdpack [Fri, 23 Jan 2015 15:31:58 +0000 (08:31 -0700)]
dshow: fix docu escapes

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
5 years agosegment: Check av_get_frame_filename() return value
Vittorio Giovara [Thu, 22 Jan 2015 20:13:45 +0000 (20:13 +0000)]
segment: Check av_get_frame_filename() return value

CC: libav-stable@libav.org
Bug-Id: CID 1265713

5 years agohlsproto: Properly close avio buffer in case of error
Vittorio Giovara [Thu, 22 Jan 2015 20:13:44 +0000 (20:13 +0000)]
hlsproto: Properly close avio buffer in case of error

Fix a memory leak.

CC: libav-stable@libav.org
Bug-Id: CID 717999

5 years agomov: Do not compute negative SAR values
Vittorio Giovara [Thu, 22 Jan 2015 19:10:27 +0000 (19:10 +0000)]
mov: Do not compute negative SAR values

This partially reverts cf70ba37ba74089a18295b29e77dead0a3222c9e, since
it didn't take into account when rotation is 0, but there is another
valid operation (eg. translation) in the matrix.

Found-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: fill in more missing hash values and dates
Michael Niedermayer [Fri, 23 Jan 2015 14:09:21 +0000 (15:09 +0100)]
doc/APIchanges: fill in more missing hash values and dates

all values before 2.5 seem to be filled in now

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_channelmap: Check for missing argument in get_channel_idx()
Michael Niedermayer [Fri, 23 Jan 2015 14:03:40 +0000 (15:03 +0100)]
avfilter/af_channelmap: Check for missing argument in get_channel_idx()

Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodshow: some devices only list themselves under "Video sources" but
rogerdpack [Fri, 23 Jan 2015 13:54:44 +0000 (06:54 -0700)]
dshow: some devices only list themselves under "Video sources" but
actually have both video and audio output pins, so make the audio pins
accessible by video source name.

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
5 years agodshow: add options for allowing filter popup configuration dialogs to be presented...
rogerdpack [Fri, 23 Jan 2015 13:49:37 +0000 (06:49 -0700)]
dshow: add options for allowing filter popup configuration dialogs to be presented to the user

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
5 years agodshow: introduce support for crossbar [multiple input selectable] devices
rogerdpack [Fri, 23 Jan 2015 13:35:16 +0000 (06:35 -0700)]
dshow: introduce support for crossbar [multiple input selectable] devices

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
5 years agodshow: drop initial audio packets with weird timestamps
rogerdpack [Fri, 23 Jan 2015 13:13:33 +0000 (06:13 -0700)]
dshow: drop initial audio packets with weird timestamps

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
5 years agodshow: use non deprecated api
rogerdpack [Fri, 23 Jan 2015 13:07:24 +0000 (06:07 -0700)]
dshow: use non deprecated api

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
5 years agompegvideo_enc: Draw edges on input for non-multiple of 16 resolutions
Michael Niedermayer [Sat, 16 Feb 2013 09:44:38 +0000 (10:44 +0100)]
mpegvideo_enc: Draw edges on input for non-multiple of 16 resolutions

This improves motion estimation and avoids using uninitialized data
for resolutions that aren't a multiple of 16.

Prior to d2a25c40, the edges used to be initialized so that encoding
was deterministic, but after that commit it started using uninitialized
data (for non multiple of 16 resolutions).

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agodshow: miscellaneous tweaks
rogerdpack [Fri, 23 Jan 2015 13:01:32 +0000 (06:01 -0700)]
dshow: miscellaneous tweaks

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
5 years agodshow: allow selecting devices by an alternative name (workaround for devices with...
rogerdpack [Fri, 23 Jan 2015 12:34:30 +0000 (05:34 -0700)]
dshow: allow selecting devices by an alternative name (workaround for devices with symbols in them), allow specifying capture pins by name and alternative (unique) name

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
5 years agolibavformat/mov.c: Handle timecode from tmcd atom in counter mode
Jon Morley [Fri, 23 Jan 2015 07:04:24 +0000 (23:04 -0800)]
libavformat/mov.c: Handle timecode from tmcd atom in counter mode

When the timecode value is in counter mode then it is important to use
the timescale and frameduration to calculate the timecode fps.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9108967513fcaff3d55514a7bca4c9fbba128c71'
Michael Niedermayer [Fri, 23 Jan 2015 11:26:23 +0000 (12:26 +0100)]
Merge commit '9108967513fcaff3d55514a7bca4c9fbba128c71'

* commit '9108967513fcaff3d55514a7bca4c9fbba128c71':
  rtspdec: Consistently use rtsp_hd_out for writing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortspdec: Consistently use rtsp_hd_out for writing
Martin Storsjö [Wed, 21 Jan 2015 13:23:50 +0000 (14:23 +0100)]
rtspdec: Consistently use rtsp_hd_out for writing

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavutil/buffer: factor buffer_replace() out
Michael Niedermayer [Wed, 14 Jan 2015 23:40:35 +0000 (00:40 +0100)]
avutil/buffer: factor buffer_replace() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: Partially decode and display single fields try #2
Michael Niedermayer [Tue, 20 Jan 2015 19:30:53 +0000 (20:30 +0100)]
avcodec/h264: Partially decode and display single fields try #2

This like the previous attempt does not fully correctly decode this
type of non standard H.264, but it now works fully automatic
requiring no manual filters or flags to be used

See Ticket2254

Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: allow .264 as extension for raw H.264 stream
Werner Robitza [Thu, 22 Jan 2015 21:02:36 +0000 (22:02 +0100)]
avformat: allow .264 as extension for raw H.264 stream

In addition to .h264, .264 is also commonly used by people to name raw H.264
streams. Enables automatic recognition of the h264 format for the .264
extension.

Signed-off-by: Werner Robitza <werner.robitza@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6341ab0ad3fde9583138e121f518e21cde15258e'
Michael Niedermayer [Thu, 22 Jan 2015 21:51:40 +0000 (22:51 +0100)]
Merge commit '6341ab0ad3fde9583138e121f518e21cde15258e'

* commit '6341ab0ad3fde9583138e121f518e21cde15258e':
  libx265: Pass through user-set frame type

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