Commit Graph

65877 Commits

Author SHA1 Message Date
Michael Niedermayer
30f680ee0a avcodec/vc1dec: fix null pointer dereference
Fixes Ticket3860

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-25 02:18:31 +02:00
Reynaldo H. Verdejo Pinochet
07bc24973b ffserver: tests, use Metadata title in config
'Title' was deprecated with 9985710a5a

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2014-08-24 20:03:22 -04:00
Reynaldo H. Verdejo Pinochet
d67d407239 ffserver: tests, use new port/bindaddress config
Comming from commit 1013d8dd69
the old Port and BindAddress config vars have been deprecated
in favor of HTTPPort and HTTPBindAddress respectively.

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2014-08-24 20:03:22 -04:00
Michael Niedermayer
3fe9e7be4c avcodec/utils: add GBRP16 to avcodec_align_dimensions2()
Fixes Ticket3869

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24 23:33:40 +02:00
Michael Niedermayer
511398031c Merge commit '424b929b5cb9ca4094099f25179829260d4b0fa3'
* commit '424b929b5cb9ca4094099f25179829260d4b0fa3':
  pulse: Add a wallclock option to be compatible with other other captures

Conflicts:
	libavdevice/pulse_audio_dec.c

wallclock mode was supported and default in FFmpeg already before this commit.
its thus left the default

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24 21:33:59 +02:00
Michael Niedermayer
c2c4cee866 avformat/matroskaenc: Check alpha_mode
Fixes CID1231992

Suggested-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24 20:33:17 +02:00
Carl Eugen Hoyos
cc0acdbd68 lavc/h264_slice: Add a missing newline to an error message. 2014-08-24 15:33:10 +02:00
Michael Niedermayer
f155e01ab0 Merge remote-tracking branch 'ubitux/codecview'
* ubitux/codecview:
  avfilter: add codecview filter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24 14:53:36 +02:00
Clément Bœsch
f888331769 avfilter: add codecview filter 2014-08-24 14:35:11 +02:00
Luca Barbato
424b929b5c pulse: Add a wallclock option to be compatible with other other captures
alsa and x11grab use av_gettime() to report timestamps.

Bug-Id: 647
2014-08-24 14:04:49 +02:00
Paul B Mahol
6dfa70f272 Correct few "ffmpeg" typos
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-08-24 11:05:42 +00:00
Paul B Mahol
b73b36bfa5 avcodec/xan: fix style issue
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-08-24 10:54:11 +00:00
Christophe Gisquet
3e892b2bcd x86: hevc_mc: split differently calls
In some cases, 2 or 3 calls are performed to functions for unusual
widths. Instead, perform 2 calls for different widths to split the
workload.

The 8+16 and 4+8 widths for respectively 8 and more than 8 bits can't
be processed that way without modifications: some calls use unaligned
buffers, and having branches to handle this was resulting in no
micro-benchmark benefit.

For block_w == 12 (around 1% of the pixels of the sequence):
Before:
12758 decicycles in epel_uni, 4093 runs, 3 skips
19389 decicycles in qpel_uni, 8187 runs, 5 skips
22699 decicycles in epel_bi, 32743 runs, 25 skips
34736 decicycles in qpel_bi, 32733 runs, 35 skips

After:
11929 decicycles in epel_uni, 4096 runs, 0 skips
18131 decicycles in qpel_uni, 8184 runs, 8 skips
20065 decicycles in epel_bi, 32750 runs, 18 skips
31458 decicycles in qpel_bi, 32753 runs, 15 skips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24 12:05:33 +02:00
Christophe Gisquet
38e2aa3759 x86: hevc_mc: correct unneeded use of SSE4 code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24 11:43:33 +02:00
Christophe Gisquet
1506ea947d pnmenc: use bits_per_raw_sample
This allows writing actual bitdepth in RGB48 when it isn't actually 16.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24 11:23:34 +02:00
Michael Niedermayer
2f0f937577 Changelog: add "H.261 RTP payload format (RFC 4587)"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24 04:11:37 +02:00
Michael Niedermayer
1aa153d644 Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
  fate: Fix ffprobe tests with --target-path set.
  doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.
  Do not print a useless error number if mov header reading fails.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24 03:58:14 +02:00
ThomasVolkert
50a4d5cfc6 Add support for H.261 RTP payload format (RFC 4587) 2014-08-24 03:53:30 +02:00
Carl Eugen Hoyos
7c0c97cc05 fate: Fix ffprobe tests with --target-path set. 2014-08-24 03:04:23 +02:00
Carl Eugen Hoyos
6f78c70324 doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate. 2014-08-24 02:49:06 +02:00
Carl Eugen Hoyos
0744daa887 Do not print a useless error number if mov header reading fails.
The error string is printed by ffmpeg as for other demuxers.
2014-08-24 02:45:58 +02:00
Michael Niedermayer
ab1e431288 avcodec/tiff: Make pixel format checks tighter
Fixes assertion failure with imgsrc001-lzma.tiff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24 01:55:19 +02:00
James Almer
b140b51ebb lavc/tiff: add support for LZMA compression
Derived from deflate code.
Requires liblzma.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24 01:21:39 +02:00
Michael Niedermayer
2e3c1699ae Merge commit '749b1f1359b5af0a08221923b016551b18ab6171'
* commit '749b1f1359b5af0a08221923b016551b18ab6171':
  configure: add --enable-rpath

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-23 22:46:06 +02:00
Michael Niedermayer
e3601ceeb8 Merge commit '5caf039ba2b4be067568a30146f29008d8db28d0'
* commit '5caf039ba2b4be067568a30146f29008d8db28d0':
  Prepare for 11_beta2 Release

Conflicts:
	RELEASE

Not merged as theres no FFmpeg 11_beta2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-23 22:08:15 +02:00
Michael Niedermayer
9bff8cfc91 Merge commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110'
* commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110':
  ogg: Use separate classes for the aliases

Conflicts:
	libavformat/oggenc.c

See: 2ccc6ff03a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-23 21:42:13 +02:00
Clément Bœsch
554d819062 avutil/pixelutils: faster pixelutils_sad_16x16
501 to 439 decicycles.

See 45c7f3997e.
2014-08-23 20:12:56 +02:00
Reinhard Tartler
749b1f1359 configure: add --enable-rpath
This option facilitates testing shared libarary builds: for instance
fate builders do no longer need to set LD_LIBRARY_PATH as the binaries will
get the right search paths hardcoded into their executable file.

This option is only meant to be used for testing purposes: The installed
libraries must not move around in the file system, and doing so will
cause a lot of subtle problems. For more information why using RPATH is
dangerous, please refer to

https://blog.flameeyes.eu/2010/06/the-why-and-how-of-rpath
2014-08-23 10:53:21 -04:00
Reinhard Tartler
5caf039ba2 Prepare for 11_beta2 Release 2014-08-23 10:12:16 -04:00
Clément Bœsch
f4dec0dba0 doc/filters: fix Shwo/Show typo 2014-08-23 16:07:55 +02:00
Reimar Döffinger
8fc9bd0d32 dict.c: Free non-strduped av_dict_set arguments on error.
Unfortunately this was not explicitly documented and thus
might be risky.
But all uses I could find in FFmpeg and one in VLC had a memleak
in these cases, and I could not find any that relied on the previous
behaviour.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-23 15:28:48 +02:00
Clément Bœsch
45c7f3997e avutil/pixelutils: faster pixelutils_sad_[au]_16x16
~560 → ~500 decicycles

This is following the comments from Michael in
https://ffmpeg.org/pipermail/ffmpeg-devel/2014-August/160599.html

Using 2 registers for accumulator didn't help. On the other hand,
some re-ordering between the movs and psadbw allowed going ~538 to ~500.
2014-08-23 10:18:53 +02:00
Muhammad Faiz
c82a288f87 avfilter/showcqt: add fontcolor option 2014-08-23 10:01:22 +02:00
Michael Niedermayer
1fa35e4352 avcodec/h264_slice: More complete cleanup in h264_slice_header_init()
Fixes null pointer dereference
Fixes Ticket3873

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-23 03:47:14 +02:00
Michael Niedermayer
949057c958 avcodec/h264: do proper cleanup in ff_h264_alloc_tables() in case DPB alloc fails
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-23 03:47:14 +02:00
Luca Barbato
f9f34cb998 ogg: Use separate classes for the aliases
Unbreak 051aadeed1
2014-08-23 02:42:18 +02:00
Michael Niedermayer
7444cf9a9c avcodec/imc: Fix bitstream buffer padding
Fixes buffer overread

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-23 01:34:28 +02:00
Christophe Gisquet
585047bb7d h264: do not return on sidedata allocation failure
Not having allocated it is not a good reason to leave the object
in an undetermined state. Though a particular setting like the
AV_EF_* flags could be useful to control that behaviour.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-23 01:01:57 +02:00
Michael Niedermayer
aaaf7261b7 avcodec/hevc_ps: fix 1 vs. 0 typo
Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-22 23:00:41 +02:00
Timothy Gu
8495c6086d vidstabutils: improve documentation
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-22 22:19:20 +02:00
Timothy Gu
6e51e746c4 vidstab*: Remove accidentally exported av_2_vs_pixel_format()
Also correctly namespace other functions in vidstabutils, and decrease
difference from Libav.

Initial-patch-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-22 22:18:46 +02:00
Michael Niedermayer
d2a0624296 Merge commit '3526ab891c28396ada8b58bf7647309bab30de1d'
* commit '3526ab891c28396ada8b58bf7647309bab30de1d':
  qt-faststart: Undefine fseeko/ftello before defining them

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-22 21:55:27 +02:00
Michael Niedermayer
8f3caf52fc Merge commit '1019b7c4edff537499c4a6cb0d65abae04ce58f6'
* commit '1019b7c4edff537499c4a6cb0d65abae04ce58f6':
  os_support: Undefine lseek/stat/fstat before defining them

Conflicts:
	libavformat/os_support.h

See: ef122ff507
See: ed3c0fe85d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-22 21:49:14 +02:00
Michael Niedermayer
300d489ac9 Merge commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd'
* commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd':
  ogg: Provide aliases for Speex, Opus and audio-only ogg

Conflicts:
	Changelog
	libavformat/oggenc.c
	libavformat/version.h

See: 2ccc6ff03a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-22 21:41:00 +02:00
Michael Niedermayer
3e07a056a8 Merge commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421'
* commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421':
  electronicarts: set the framerate for TGQ/TQI

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-22 21:00:06 +02:00
Michael Niedermayer
ce1059d5c9 Merge commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136'
* commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136':
  electronicarts: read the framerate for MAD

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-22 20:50:16 +02:00
Christophe Gisquet
4adad5a19a wavpackenc: reset trailer info on block encoding
In some cases, in particular if several blocks are needed because of
the channel layout (e.g. 2.1), the information used to write the
trailing bits terminating the sample data was not reset.

This would cause potential desync on the decoder, although decoded
samples were actually mostly fine.

Fixes ticket #3879.
2014-08-22 18:44:16 +00:00
Christophe Gisquet
a59f85d106 wavpack: check number of channels
This means container and codec disagree. The codec is supposed to
know better so this could be an error instead.
2014-08-22 18:43:30 +00:00
Michael Niedermayer
350dd85345 Merge commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b'
* commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b':
  electronicarts: do not fail on zero-sized chunks

Conflicts:
	libavformat/electronicarts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-22 19:01:26 +02:00
Michael Niedermayer
e356f6c55d Merge commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08'
* commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08':
  rv34: use ff_mpeg_update_thread_context only when decoder is fully initialized

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-22 18:49:52 +02:00