ffmpeg.git
4 years agoversion string: add copyright line to version string
Simon Thelen [Tue, 10 Jun 2014 23:58:44 +0000 (01:58 +0200)]
version string: add copyright line to version string

Show the copyright when running `ffmpeg -version'. This is useful for
end users trying to determine whether they are using FFmpeg or Libav.

Signed-off-by: Simon Thelen <ffmpeg@c-14.de>
4 years agoavcodec/bitstream: try to make vlc init code inherently thread safe
Michael Niedermayer [Mon, 16 Jun 2014 17:40:02 +0000 (19:40 +0200)]
avcodec/bitstream: try to make vlc init code inherently thread safe

also remove spinlock, it doesnt work on AIX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/bitstream: fill invalid vlc tables entries as last pass instead of first
Michael Niedermayer [Mon, 16 Jun 2014 16:46:14 +0000 (18:46 +0200)]
avcodec/bitstream: fill invalid vlc tables entries as last pass instead of first

This avoids writing entries twice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/bitstream: zero vlc tables on allocation
Michael Niedermayer [Mon, 16 Jun 2014 16:45:18 +0000 (18:45 +0200)]
avcodec/bitstream: zero vlc tables on allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoForce aix strip to work on 32 and 64 bit by default.
Carl Eugen Hoyos [Mon, 16 Jun 2014 14:46:10 +0000 (16:46 +0200)]
Force aix strip to work on 32 and 64 bit by default.

4 years agoavcodec/h264: fix frame skip code
Michael Niedermayer [Sat, 7 Jun 2014 18:56:20 +0000 (20:56 +0200)]
avcodec/h264: fix frame skip code

Fixes Ticket3475

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_slice: support skipping loop filtering for non key frames
Michael Niedermayer [Sat, 7 Jun 2014 18:56:19 +0000 (20:56 +0200)]
avcodec/h264_slice: support skipping loop filtering for non key frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: use the correct level for droping non intra frames
Michael Niedermayer [Sat, 7 Jun 2014 18:56:18 +0000 (20:56 +0200)]
avcodec/h264: use the correct level for droping non intra frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb'
Michael Niedermayer [Mon, 16 Jun 2014 11:13:21 +0000 (13:13 +0200)]
Merge commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb'

* commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb':
  configure: Directly support Android as target OS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '766f2d965ff1948749c37f26a714adb8aa89c4a9'
Michael Niedermayer [Mon, 16 Jun 2014 11:04:36 +0000 (13:04 +0200)]
Merge commit '766f2d965ff1948749c37f26a714adb8aa89c4a9'

* commit '766f2d965ff1948749c37f26a714adb8aa89c4a9':
  gitignore: add dylib and swp entries

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '711aa2a82727907f778fb8aa9a93aff2120170f2'
Michael Niedermayer [Mon, 16 Jun 2014 10:54:36 +0000 (12:54 +0200)]
Merge commit '711aa2a82727907f778fb8aa9a93aff2120170f2'

* commit '711aa2a82727907f778fb8aa9a93aff2120170f2':
  lavf: dump stream side data when probing

Conflicts:
libavformat/dump.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/dump: put copyright back from the file from which dump.c was split out
Michael Niedermayer [Mon, 16 Jun 2014 10:39:44 +0000 (12:39 +0200)]
avformat/dump: put copyright back from the file from which dump.c was split out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb'
Michael Niedermayer [Mon, 16 Jun 2014 10:24:53 +0000 (12:24 +0200)]
Merge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb'

* commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb':
  lavf: group dump functions together

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f'
Michael Niedermayer [Mon, 16 Jun 2014 10:09:15 +0000 (12:09 +0200)]
Merge commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f'

* commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f':
  vf_showinfo: print display transformation values

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: Directly support Android as target OS
Luca Barbato [Fri, 13 Jun 2014 13:14:10 +0000 (15:14 +0200)]
configure: Directly support Android as target OS

4 years agogitignore: add dylib and swp entries
Vittorio Giovara [Mon, 16 Jun 2014 05:31:37 +0000 (01:31 -0400)]
gitignore: add dylib and swp entries

4 years agoAdd nointra AVDiscard level
Michael Niedermayer [Sat, 7 Jun 2014 18:56:17 +0000 (20:56 +0200)]
Add nointra AVDiscard level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 15 Jun 2014 23:38:44 +0000 (01:38 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not suggest to use gas-preprocessor on aix where it doesn't work.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswr: reindent.
Ronald S. Bultje [Sun, 15 Jun 2014 22:49:18 +0000 (18:49 -0400)]
swr: reindent.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/huffyuvdec: Fix fill value for truncated bitstreams
Michael Niedermayer [Sun, 15 Jun 2014 23:06:50 +0000 (01:06 +0200)]
avcodec/huffyuvdec: Fix fill value for truncated bitstreams

Found-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoDo not suggest to use gas-preprocessor on aix where it doesn't work.
Carl Eugen Hoyos [Sun, 15 Jun 2014 23:01:40 +0000 (01:01 +0200)]
Do not suggest to use gas-preprocessor on aix where it doesn't work.

4 years agohuffyuvdec: use unsafe bitstream reader
Christophe Gisquet [Sun, 15 Jun 2014 10:04:36 +0000 (12:04 +0200)]
huffyuvdec: use unsafe bitstream reader

The reader reads in chunks of 11 bits at most, and at most 3 times. The unsafe
reader therefore may read 6 chunks instead of 1 in worst case, ie 8 bytes,
which is within the padding tolerance.

The reader ends up being ~10% faster. Cumulative effect of unsafe reading and
code block swapping on 3 sequences is for 1 thread, decoding time goes from
23.3s to 19.0s.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohuffyuv: fate: add a BGR24 test
Christophe Gisquet [Sun, 15 Jun 2014 17:33:46 +0000 (19:33 +0200)]
huffyuv: fate: add a BGR24 test

It was previously untested.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevc: Fix 4K sample video
Kieran [Sat, 14 Jun 2014 18:25:09 +0000 (19:25 +0100)]
hevc: Fix 4K sample video

Reviewed-by: smarter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/smoothstreamingenc: Use av_mallocz_array()
Michael Niedermayer [Sun, 15 Jun 2014 21:20:56 +0000 (23:20 +0200)]
avformat/smoothstreamingenc: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix compilation on ppc64 and ppc with pic if gas-preprocessor is installed.
Carl Eugen Hoyos [Sun, 15 Jun 2014 20:51:23 +0000 (22:51 +0200)]
Fix compilation on ppc64 and ppc with pic if gas-preprocessor is installed.

4 years agoavcodec/dvbsubdec: Split save_subtitle_set() out
Anshul Maheshwari [Sat, 14 Jun 2014 11:36:37 +0000 (17:06 +0530)]
avcodec/dvbsubdec: Split save_subtitle_set() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dvbsubdec: add AVClass to context
Anshul Maheshwari [Sat, 14 Jun 2014 11:36:37 +0000 (17:06 +0530)]
avcodec/dvbsubdec: add AVClass to context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dvbsubdec: restructure version check
Anshul Maheshwari [Sat, 14 Jun 2014 11:36:37 +0000 (17:06 +0530)]
avcodec/dvbsubdec: restructure version check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/framecrcenc: print the checksum and size of extradata as well
Michael Niedermayer [Fri, 13 Jun 2014 22:30:25 +0000 (00:30 +0200)]
avformat/framecrcenc: print the checksum and size of extradata as well

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohuffyuvdec: remove somewhat deprecated code
Christophe Gisquet [Sun, 15 Jun 2014 13:13:16 +0000 (15:13 +0200)]
huffyuvdec: remove somewhat deprecated code

The old code was reserving the 0xFFFF entry to represent an inexisting
entry/codeword. These entries are now detected through their length
being <= 0. As this entry is often used for the residuals (-1,-1), which
should be among the most frequent, it is particularly important to not
reserve it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMAINTAINERS: Add Co maintainer for huffyuv*, rv4*, vc1*
Christophe Gisquet [Sun, 15 Jun 2014 14:22:45 +0000 (16:22 +0200)]
MAINTAINERS: Add Co maintainer for huffyuv*, rv4*, vc1*

Patch by: Christophe Gisquet
Commit Message by commiter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/huffyuvdec: assume vlcs can be 32 instead of 31 bits max
Michael Niedermayer [Sun, 15 Jun 2014 14:14:30 +0000 (16:14 +0200)]
avcodec/huffyuvdec: assume vlcs can be 32 instead of 31 bits max

This should avoid a division as well

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohuffyuvdec: swap code blocks
Christophe Gisquet [Sun, 15 Jun 2014 10:07:16 +0000 (12:07 +0200)]
huffyuvdec: swap code blocks

The effect is not really deterministic, as it seems to be a combination
on x86_64 of fewer registers used, different jump offsets and, for all
archs, of likely branches.

Speedup is around 15%.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswr: compile mmx2 s16p functions only on x86-32.
Ronald S. Bultje [Sat, 14 Jun 2014 18:55:49 +0000 (14:55 -0400)]
swr: compile mmx2 s16p functions only on x86-32.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86util: add and use RSHIFT/LSHIFT macros
Christophe Gisquet [Sat, 14 Jun 2014 23:05:03 +0000 (01:05 +0200)]
x86util: add and use RSHIFT/LSHIFT macros

Those macros take a byte number as shift argument, as this argument
differs between MMX and SSE2 instructions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: yadif: add >8 bit tests
Christophe Gisquet [Sun, 15 Jun 2014 08:39:25 +0000 (10:39 +0200)]
fate: yadif: add >8 bit tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoaandcttab: fix spelling
Christophe Gisquet [Sat, 14 Jun 2014 19:55:08 +0000 (21:55 +0200)]
aandcttab: fix spelling

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/xbmdec: remove dependancy on zero padding on input packet
Michael Niedermayer [Sun, 15 Jun 2014 01:38:50 +0000 (03:38 +0200)]
avcodec/xbmdec: remove dependancy on zero padding on input packet

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/indeo5: Fix infinite loop in skip_hdr_extension()
Michael Niedermayer [Sun, 15 Jun 2014 01:17:11 +0000 (03:17 +0200)]
avcodec/indeo5: Fix infinite loop in skip_hdr_extension()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswr: add prototypes for resample dsp functions
James Almer [Sat, 14 Jun 2014 22:21:44 +0000 (19:21 -0300)]
swr: add prototypes for resample dsp functions

Should fix compilation failures with MSVC and any other compiler
without inline asm support.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mpc: attempt to allocate a packet that is not smaller than the data inside it
Michael Niedermayer [Sat, 14 Jun 2014 22:49:02 +0000 (00:49 +0200)]
avformat/mpc: attempt to allocate a packet that is not smaller than the data inside it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswr: remove obsolete function prototypes.
Ronald S. Bultje [Sat, 14 Jun 2014 22:01:04 +0000 (18:01 -0400)]
swr: remove obsolete function prototypes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: for h264 we need has_b_frames from the decoder
Michael Niedermayer [Sat, 14 Jun 2014 21:23:42 +0000 (23:23 +0200)]
ffmpeg: for h264 we need has_b_frames from the decoder

Other solutions welcome

Fixes Ticket3711

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: print values of mismatching has_b_frames
Michael Niedermayer [Sat, 14 Jun 2014 21:09:21 +0000 (23:09 +0200)]
ffmpeg: print values of mismatching has_b_frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agocmdutils: implement FFREPORT=level=...
Michael Niedermayer [Mon, 12 May 2014 20:23:36 +0000 (22:23 +0200)]
cmdutils: implement FFREPORT=level=...

Fixes Ticket3057

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/filters: remove double quotes from zoompan example
Lou Logan [Wed, 11 Jun 2014 20:56:04 +0000 (12:56 -0800)]
doc/filters: remove double quotes from zoompan example

Based on suggested change by Clément Bœsch.

Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ppc/idct_altivec: add plain idct()
Michael Niedermayer [Sat, 14 Jun 2014 16:32:17 +0000 (18:32 +0200)]
avcodec/ppc/idct_altivec: add plain idct()

Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswr: split out DSP functions.
Ronald S. Bultje [Sat, 14 Jun 2014 18:11:03 +0000 (14:11 -0400)]
swr: split out DSP functions.

DSP bits of swri_resample go into their own mini-DSP functions; DSP
init goes from a per-call branch in multiple_resample to a proper
DSP init routine; x86 bits go into x86/; swri_resample() moves out of
resample_template.c into resample.c because it's independent of DSP
code or sample type; multiple_resample() is simplified.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agompeg12enc: add seq_disp_ext option for deciding when to write a sequence_display_exte...
Marton Balint [Sat, 14 Jun 2014 15:07:28 +0000 (17:07 +0200)]
mpeg12enc: add seq_disp_ext option for deciding when to write a sequence_display_extension

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agompeg12enc: add support for PANSCAN side data in sequence_display_extension
Marton Balint [Sat, 14 Jun 2014 15:07:27 +0000 (17:07 +0200)]
mpeg12enc: add support for PANSCAN side data in sequence_display_extension

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix compilation with --disable-everything --enable-parser=vc1.
Carl Eugen Hoyos [Sat, 14 Jun 2014 17:19:52 +0000 (19:19 +0200)]
Fix compilation with --disable-everything --enable-parser=vc1.

4 years agoavcodec/vc1dec: Fix support for small widths/linesizes
Michael Niedermayer [Sat, 14 Jun 2014 14:23:09 +0000 (16:23 +0200)]
avcodec/vc1dec: Fix support for small widths/linesizes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/resample: replace assert by av_assert
Michael Niedermayer [Sat, 14 Jun 2014 12:41:01 +0000 (14:41 +0200)]
swresample/resample: replace assert by av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix standalone compilation of the H264 decoder on ppc.
Carl Eugen Hoyos [Sat, 14 Jun 2014 13:44:52 +0000 (15:44 +0200)]
Fix standalone compilation of the H264 decoder on ppc.

4 years agoswr: handle initial negative sample index outside DSP function.
Ronald S. Bultje [Fri, 13 Jun 2014 23:06:30 +0000 (19:06 -0400)]
swr: handle initial negative sample index outside DSP function.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate/aic: force simple idct
Michael Niedermayer [Sat, 14 Jun 2014 10:30:38 +0000 (12:30 +0200)]
fate/aic: force simple idct

This should ensure all platforms use the same idct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMAINTAINERS: add my (Timothy Gu's) PGP fingerprint and my name for fateserver
Timothy Gu [Wed, 11 Jun 2014 00:37:23 +0000 (17:37 -0700)]
MAINTAINERS: add my (Timothy Gu's) PGP fingerprint and my name for fateserver

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf: dump stream side data when probing
Vittorio Giovara [Tue, 15 Apr 2014 14:55:23 +0000 (16:55 +0200)]
lavf: dump stream side data when probing

4 years agolavf: group dump functions together
Vittorio Giovara [Tue, 15 Apr 2014 14:08:58 +0000 (16:08 +0200)]
lavf: group dump functions together

4 years agovf_showinfo: print display transformation values
Vittorio Giovara [Mon, 24 Mar 2014 17:12:35 +0000 (18:12 +0100)]
vf_showinfo: print display transformation values

4 years agoswr: remove unnecessary assignment.
Ronald S. Bultje [Sat, 14 Jun 2014 00:25:51 +0000 (20:25 -0400)]
swr: remove unnecessary assignment.

I don't see dst_incr/dst_incr_frac ever being changed from their
initial value (which is the inverse of this operation), so it seems
to me that this is a no-op.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/af_asetnsamples: fix pts handling when timebase and 1/samplerate differ
Michael Niedermayer [Sat, 14 Jun 2014 02:22:58 +0000 (04:22 +0200)]
avfilter/af_asetnsamples: fix pts handling when timebase and 1/samplerate differ

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: Fix bitstream filters manipulating AVCodecContext
Michael Niedermayer [Fri, 13 Jun 2014 22:50:50 +0000 (00:50 +0200)]
ffmpeg: Fix bitstream filters manipulating AVCodecContext

Fixes Ticket3715

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/formats: Use av_realloc_array()
Michael Niedermayer [Fri, 13 Jun 2014 21:15:16 +0000 (23:15 +0200)]
avfilter/formats: Use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_dejudder: Use av_mallocz_array()
Michael Niedermayer [Fri, 13 Jun 2014 21:14:38 +0000 (23:14 +0200)]
avfilter/vf_dejudder: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_unsharp: use av_malloc_array()
Michael Niedermayer [Fri, 13 Jun 2014 21:14:18 +0000 (23:14 +0200)]
avfilter/vf_unsharp: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/svq1enc: fix encoding of small widths
Michael Niedermayer [Fri, 13 Jun 2014 18:59:24 +0000 (20:59 +0200)]
avcodec/svq1enc: fix encoding of small widths

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovfilter/avf_showcqt: fix 'mixed declarations and code'
Michael Niedermayer [Fri, 13 Jun 2014 18:32:35 +0000 (20:32 +0200)]
vfilter/avf_showcqt: fix 'mixed declarations and code'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '27631796c9d1b8146ad4a16e6539ecc08afa7565'
Michael Niedermayer [Fri, 13 Jun 2014 17:10:19 +0000 (19:10 +0200)]
Merge commit '27631796c9d1b8146ad4a16e6539ecc08afa7565'

* commit '27631796c9d1b8146ad4a16e6539ecc08afa7565':
  ac3: Only initialize float_dsp for the float encoder variant

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b'
Michael Niedermayer [Fri, 13 Jun 2014 17:03:47 +0000 (19:03 +0200)]
Merge commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b'

* commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b':
  Rename tpel_template.c ---> pel_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo: check that linesize is not too small
Michael Niedermayer [Fri, 13 Jun 2014 15:12:00 +0000 (17:12 +0200)]
avcodec/mpegvideo: check that linesize is not too small

Note linesize is rounded up to at least a multiple of 8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/rv34: fix edge emu with uv stride <= 25
Michael Niedermayer [Fri, 13 Jun 2014 14:13:13 +0000 (16:13 +0200)]
avcodec/rv34: fix edge emu with uv stride <= 25

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMAINTAINERS: Added Tim Nicholson's key fingerprint
Tim.Nicholson [Fri, 13 Jun 2014 13:41:43 +0000 (14:41 +0100)]
MAINTAINERS: Added Tim Nicholson's key fingerprint

Signed-off-by: Tim.Nicholson <tim.nicholson@bbc.co.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale: Allow the max filter size to be set at compile time
Derek Buitenhuis [Wed, 11 Jun 2014 16:51:49 +0000 (17:51 +0100)]
swscale: Allow the max filter size to be set at compile time

This can help "extreme" resizes, e.g with some 4k stuff.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoac3: Only initialize float_dsp for the float encoder variant
Diego Biurrun [Wed, 11 Jun 2014 12:32:01 +0000 (05:32 -0700)]
ac3: Only initialize float_dsp for the float encoder variant

4 years agoRename tpel_template.c ---> pel_template.c
Diego Biurrun [Thu, 12 Jun 2014 14:05:49 +0000 (07:05 -0700)]
Rename tpel_template.c ---> pel_template.c

The new name more accurately describes what the file is about.

4 years agoavcodec/mpegvideo: Fix psnr calculation with slice threads
Michael Niedermayer [Fri, 13 Jun 2014 11:04:31 +0000 (13:04 +0200)]
avcodec/mpegvideo: Fix psnr calculation with slice threads

This fixes a race condition and use of the wrong field, which become shared
instead of per thread during some AVFrame changes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavcodec/wmv2: remove dead code
Michael Niedermayer [Fri, 13 Jun 2014 02:21:52 +0000 (04:21 +0200)]
libavcodec/wmv2: remove dead code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4321e507564b2d8a5dfc630f8d6fefba6fdc1e92'
Michael Niedermayer [Fri, 13 Jun 2014 00:36:22 +0000 (02:36 +0200)]
Merge commit '4321e507564b2d8a5dfc630f8d6fefba6fdc1e92'

* commit '4321e507564b2d8a5dfc630f8d6fefba6fdc1e92':
  configure: use pkg-config for libx264

Not merged as requested by carl
a patch to fix this has been posted by carl to ffmpeg-devel

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo: fix edge emulation with uvlinesize below 25
Michael Niedermayer [Thu, 12 Jun 2014 23:45:23 +0000 (01:45 +0200)]
avcodec/mpegvideo: fix edge emulation with uvlinesize below 25

Fixes fate-vsynth3-wmv2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavd/avfoundation: Support user selected pixel formats and pixel format autoselection.
sfan5 [Wed, 11 Jun 2014 18:26:33 +0000 (20:26 +0200)]
lavd/avfoundation: Support user selected pixel formats and pixel format autoselection.

Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ceada893bec1e29e457bd2b81d8a0b6fcba5f1f7'
Michael Niedermayer [Thu, 12 Jun 2014 19:30:09 +0000 (21:30 +0200)]
Merge commit 'ceada893bec1e29e457bd2b81d8a0b6fcba5f1f7'

* commit 'ceada893bec1e29e457bd2b81d8a0b6fcba5f1f7':
  libx265: Remove unneeded bit depth check

See: 7ed89addb7f6271d17c2ba21ec11204e37fa9917
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '61a344916d324c8ca52064964478f46c877f02e2'
Michael Niedermayer [Thu, 12 Jun 2014 19:28:45 +0000 (21:28 +0200)]
Merge commit '61a344916d324c8ca52064964478f46c877f02e2'

* commit '61a344916d324c8ca52064964478f46c877f02e2':
  libx265: Add 4:2:2 support

See: 6ee95af8a1181f02e7f3adb9b5d488ba3314e220
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '180e6b48060f97fdd8497320395b61dc85664ecd'
Michael Niedermayer [Thu, 12 Jun 2014 19:20:10 +0000 (21:20 +0200)]
Merge commit '180e6b48060f97fdd8497320395b61dc85664ecd'

* commit '180e6b48060f97fdd8497320395b61dc85664ecd':
  libx265: Actually use X265_API_IMPORTS

See: 4e9b46b0568196e9e1640350a3c6f5f09bfd9e47
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: use pkg-config for libx264
Vittorio Giovara [Tue, 10 Jun 2014 21:46:57 +0000 (17:46 -0400)]
configure: use pkg-config for libx264

4 years agoMerge commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4'
Michael Niedermayer [Thu, 12 Jun 2014 18:25:48 +0000 (20:25 +0200)]
Merge commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4'

* commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4':
  Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs

Conflicts:
libavcodec/ac3enc_float.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibx265: Remove unneeded bit depth check
Derek Buitenhuis [Wed, 11 Jun 2014 20:20:43 +0000 (21:20 +0100)]
libx265: Remove unneeded bit depth check

This is no longer needed since the version bump.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agolibx265: Add 4:2:2 support
Derek Buitenhuis [Wed, 11 Jun 2014 20:19:42 +0000 (21:19 +0100)]
libx265: Add 4:2:2 support

It is also not final yet, so require -strict experimental.

Requires a bump to version 17.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agolibx265: Actually use X265_API_IMPORTS
Derek Buitenhuis [Wed, 11 Jun 2014 19:51:52 +0000 (20:51 +0100)]
libx265: Actually use X265_API_IMPORTS

It obvously needs to be above the include statement.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agolibx265: Remove unneeded bit depth check
Derek Buitenhuis [Wed, 11 Jun 2014 20:20:43 +0000 (21:20 +0100)]
libx265: Remove unneeded bit depth check

This is no longer needed since the version bump.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoRemove some unnecessary CONFIG_FOO_COMPONENT ifdefs
Diego Biurrun [Wed, 11 Jun 2014 12:48:30 +0000 (05:48 -0700)]
Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs

The files are only ever compiled if that condition is true.

4 years agolibx265: Add 4:2:2 support
Derek Buitenhuis [Wed, 11 Jun 2014 20:19:42 +0000 (21:19 +0100)]
libx265: Add 4:2:2 support

It is also not final yet, so require -strict experimental.

Requires a bump to version 17.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agolibx265: Actually use X265_API_IMPORTS
Derek Buitenhuis [Wed, 11 Jun 2014 19:51:52 +0000 (20:51 +0100)]
libx265: Actually use X265_API_IMPORTS

It obvously needs to be above the include statement.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '48e50921337984ba4ec2c1cafe45d43787f84498'
Michael Niedermayer [Thu, 12 Jun 2014 10:02:34 +0000 (12:02 +0200)]
Merge commit '48e50921337984ba4ec2c1cafe45d43787f84498'

* commit '48e50921337984ba4ec2c1cafe45d43787f84498':
  avconv: make -shortest work with streamcopy

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/avf_showcqt: add option for lower resolution
Muhammad Faiz [Thu, 12 Jun 2014 09:09:41 +0000 (09:09 +0000)]
avfilter/avf_showcqt: add option for lower resolution

Resolution can be 1920x1080 or 960x540.

4 years agoavconv: make -shortest work with streamcopy
Anton Khirnov [Tue, 10 Jun 2014 15:41:57 +0000 (17:41 +0200)]
avconv: make -shortest work with streamcopy

CC: libav-stable@libav.org
4 years agovp9/x86: fix overwrite in ipred_vl_4x4_ssse3.
Ronald S. Bultje [Thu, 12 Jun 2014 01:09:54 +0000 (21:09 -0400)]
vp9/x86: fix overwrite in ipred_vl_4x4_ssse3.

Fixes track ticket 3717.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libx264: fix "bitrate reconfiguration"
Michael Niedermayer [Wed, 11 Jun 2014 23:03:46 +0000 (01:03 +0200)]
avcodec/libx264: fix "bitrate reconfiguration"

4 years agoMerge commit '2f4170312f605c1f02a14c01347e94cf46726dbd'
Michael Niedermayer [Wed, 11 Jun 2014 22:55:48 +0000 (00:55 +0200)]
Merge commit '2f4170312f605c1f02a14c01347e94cf46726dbd'

* commit '2f4170312f605c1f02a14c01347e94cf46726dbd':
  libx264: Support bitrate reconfiguration

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