]> git.sesse.net Git - ffmpeg/log
ffmpeg
9 years agoAdd a closing LF to Webm-manifest files.
Carl Eugen Hoyos [Tue, 16 Sep 2014 15:24:56 +0000 (17:24 +0200)]
Add a closing LF to Webm-manifest files.

Fixes fate-webm-dash-manifest on AIX.

Reviewed-by: Nicolas George
9 years agosws: use av_clip() instead of av_clip_c()
Clément Bœsch [Tue, 16 Sep 2014 08:08:09 +0000 (10:08 +0200)]
sws: use av_clip() instead of av_clip_c()

9 years agoavformat/flacenc: use av_clip() instead of av_clip_c()
Clément Bœsch [Tue, 16 Sep 2014 08:07:56 +0000 (10:07 +0200)]
avformat/flacenc: use av_clip() instead of av_clip_c()

9 years agolavf/hls: add hls_ts_option
Steven Liu [Fri, 12 Sep 2014 10:04:52 +0000 (18:04 +0800)]
lavf/hls: add hls_ts_option

Same as COMMITID 4f5493fe2380ad4aba67759baa7d7d4437f2e776.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
9 years agodoc/examples/transcoding: use av_packet_rescale_ts()
Stefano Sabatini [Wed, 10 Sep 2014 10:16:09 +0000 (12:16 +0200)]
doc/examples/transcoding: use av_packet_rescale_ts()

Simplify.

9 years agoMerge commit '2d589273dd36c5eb271a035ea0e669b64dae257f'
Michael Niedermayer [Tue, 16 Sep 2014 09:57:58 +0000 (11:57 +0200)]
Merge commit '2d589273dd36c5eb271a035ea0e669b64dae257f'

* commit '2d589273dd36c5eb271a035ea0e669b64dae257f':
  configure: Split adding of CFLAGS and CPPFLAGS for hardened toolchain

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoconfigure: Split adding of CFLAGS and CPPFLAGS for hardened toolchain
Diego Biurrun [Wed, 30 Jul 2014 12:09:47 +0000 (05:09 -0700)]
configure: Split adding of CFLAGS and CPPFLAGS for hardened toolchain

9 years agoavcodec/h264_sei: ff_h264_decode_sei: dont try to parse trailing zeroes
Michael Niedermayer [Tue, 16 Sep 2014 01:57:00 +0000 (03:57 +0200)]
avcodec/h264_sei: ff_h264_decode_sei: dont try to parse trailing zeroes

reduces noise for tserrors.ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/mpegtsenc: More verbose warning messages in case of missing video ES startcodes
Michael Niedermayer [Tue, 16 Sep 2014 01:56:03 +0000 (03:56 +0200)]
avformat/mpegtsenc: More verbose warning messages in case of missing video ES startcodes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/network: move sockaddr_union after sockaddr_storage compatibility code
Michael Niedermayer [Mon, 15 Sep 2014 23:00:49 +0000 (01:00 +0200)]
avformat/network: move sockaddr_union after sockaddr_storage compatibility code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agobuild: simplify libwebp check
Clément Bœsch [Mon, 1 Sep 2014 07:41:44 +0000 (09:41 +0200)]
build: simplify libwebp check

Tested (compilation and runtime) with libwebp 0.2.0, 0.2.1 and 0.4.1.

9 years agoMerge commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc'
Michael Niedermayer [Mon, 15 Sep 2014 20:31:43 +0000 (22:31 +0200)]
Merge commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc'

* commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc':
  ismindex: handle time discontinuities and nonzero start time

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agohlsenc: single_file, support HLS ver 4 byteranges
Mika Raento [Mon, 15 Sep 2014 13:26:57 +0000 (16:26 +0300)]
hlsenc: single_file, support HLS ver 4 byteranges

This adds a new option -hls_flags single_file that creates one .ts file
for HLS and adds byteranges to the .m3u8 file, instead of creating one
.ts file for each segment.

This is helpful at least for storing large number of videos, as the
number of files per video is drastically reduced and copying and storing
those files takes less requests and inodes.

This is based on work by Nicolas Martyanoff, discussed on ffmpeg-devel
in July 2014. That patch seems abandoned by the author, and contained
unrelated changes. This patch tries to add the minimum amount of code to
support the byterange playlists.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter: remove obsolete FF_API_BUFFERSRC_BUFFER cruft
James Almer [Mon, 15 Sep 2014 00:31:34 +0000 (21:31 -0300)]
avfilter: remove obsolete FF_API_BUFFERSRC_BUFFER cruft

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
9 years agoavutil: remove obsolete FF_API_OLD_OPENCL cruft
James Almer [Mon, 15 Sep 2014 00:19:29 +0000 (21:19 -0300)]
avutil: remove obsolete FF_API_OLD_OPENCL cruft

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
9 years agoavutil: remove obsolete FF_API_LLS1 cruft
James Almer [Mon, 15 Sep 2014 00:17:43 +0000 (21:17 -0300)]
avutil: remove obsolete FF_API_LLS1 cruft

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
9 years agoismindex: handle time discontinuities and nonzero start time
Mika Raento [Sun, 14 Sep 2014 16:00:56 +0000 (19:00 +0300)]
ismindex: handle time discontinuities and nonzero start time

The input file may not have consistent start times, stream durations and
chunk durations. This patch at least removes negative durations that
make chromecast unhappy, and correctly sets starting time on chunks so
that the split (or .ismf) outputs match the manifest.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoRELEASE: update to 2.4.git
James Almer [Mon, 15 Sep 2014 04:46:05 +0000 (01:46 -0300)]
RELEASE: update to 2.4.git

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
9 years agoavformat/rtpproto: fix strict aliasing violations with sockaddr
Michael Niedermayer [Thu, 11 Sep 2014 23:52:39 +0000 (01:52 +0200)]
avformat/rtpproto: fix strict aliasing violations with sockaddr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/network: add union for avoiding strict aliassing violations with sockaddr*
Michael Niedermayer [Thu, 11 Sep 2014 23:52:38 +0000 (01:52 +0200)]
avformat/network: add union for avoiding strict aliassing violations with sockaddr*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec: remove obsolete FF_API_DSPUTIL cruft
James Almer [Sun, 14 Sep 2014 23:41:44 +0000 (20:41 -0300)]
avcodec: remove obsolete FF_API_DSPUTIL cruft

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
9 years agoavcodec/tiff: fix odd dimensioned yuv
Michael Niedermayer [Sun, 14 Sep 2014 23:33:09 +0000 (01:33 +0200)]
avcodec/tiff: fix odd dimensioned yuv

Fixes Ticket3893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/libvpxdec: Adds decode support for formats other than 420
Deb Mukherjee [Sun, 14 Sep 2014 14:43:27 +0000 (07:43 -0700)]
avcodec/libvpxdec: Adds decode support for formats other than 420

Handles decoding of new VP9 profiles 1-3 with different color sampling
and bit-depths.

For high bitdepth (profiles 2 and 3) support, we currently need to link
with the highbitdepth branch of libvpx with --enable-experimental
and --enable-vp9-high config options on. But eventually this branch will
be merged into master, whereafter to enable high bitdepth
support you will need to link with libvpx with configure option
--enable-vp9-highbitdepth on.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/microdvddec: indent fix
Clément Bœsch [Sun, 14 Sep 2014 18:00:11 +0000 (20:00 +0200)]
avcodec/microdvddec: indent fix

9 years agoavcodec/utils: remove avcodec_ prefix for internal symbol
Clément Bœsch [Sun, 14 Sep 2014 17:00:26 +0000 (19:00 +0200)]
avcodec/utils: remove avcodec_ prefix for internal symbol

9 years agoavcodec/mjpegenc: the AMV encoder doesnt support yuv422
Michael Niedermayer [Sun, 14 Sep 2014 15:09:38 +0000 (17:09 +0200)]
avcodec/mjpegenc: the AMV encoder doesnt support yuv422

Fixes Ticket3883

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoChangelog: add 2.4
Michael Niedermayer [Sun, 14 Sep 2014 14:47:26 +0000 (16:47 +0200)]
Changelog: add 2.4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc/examples: remove unneeded NULL checks
Michael Niedermayer [Fri, 15 Aug 2014 22:27:14 +0000 (00:27 +0200)]
doc/examples: remove unneeded NULL checks

dst_file cannot be NULL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMAINTAINERS: Add 2.4 to maintained releases, drop 2.3
Michael Niedermayer [Sun, 14 Sep 2014 10:54:01 +0000 (12:54 +0200)]
MAINTAINERS: Add 2.4 to maintained releases, drop 2.3

2.2 is used by 4 distributions, 2.3 by none, thus continuing maintaining
2.2 makes more sense than 2.3 see:
https://trac.ffmpeg.org/wiki/Downstreams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoChangelog/RELEASE_NOTES: prepare for 2.4
Clément Bœsch [Sun, 14 Sep 2014 06:32:46 +0000 (08:32 +0200)]
Changelog/RELEASE_NOTES: prepare for 2.4

9 years agodoc/APIchanges: Update hashes and dates
Michael Niedermayer [Sun, 14 Sep 2014 10:45:36 +0000 (12:45 +0200)]
doc/APIchanges: Update hashes and dates

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc/APIchanges: attempt to split releases
Clément Bœsch [Sun, 14 Sep 2014 06:56:02 +0000 (08:56 +0200)]
doc/APIchanges: attempt to split releases

Based on several git show origin/release/X.Y:doc/APIchanges.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc: mention important API changes in the RELEASE_NOTES
Andreas Cadhalpun [Sun, 14 Sep 2014 00:08:08 +0000 (02:08 +0200)]
doc: mention important API changes in the RELEASE_NOTES

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffserver: drop custom skip_spaces() impl
Reynaldo H. Verdejo Pinochet [Sat, 13 Sep 2014 23:52:03 +0000 (20:52 -0300)]
ffserver: drop custom skip_spaces() impl

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years agoffserver: use correct error for stream not found
Reynaldo H. Verdejo Pinochet [Sat, 13 Sep 2014 22:05:04 +0000 (19:05 -0300)]
ffserver: use correct error for stream not found

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years agodoc: mention in APIChanges that AVProbeData must be initialized due to the new mime_t...
Andreas Cadhalpun [Sat, 13 Sep 2014 22:52:42 +0000 (00:52 +0200)]
doc: mention in APIChanges that AVProbeData must be initialized due to the new mime_type field

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRELEASE_NOTES: add version numbers
Michael Niedermayer [Sat, 13 Sep 2014 22:14:58 +0000 (00:14 +0200)]
RELEASE_NOTES: add version numbers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRELEASE_NOTES: Add next versions name (Fresnel)
Michael Niedermayer [Sat, 13 Sep 2014 21:43:20 +0000 (23:43 +0200)]
RELEASE_NOTES: Add next versions name (Fresnel)

The name is "randomly" picked from previous suggestions
If people prefer something else, suggest it quickly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/utils: free s->pb for image2 as it can be used with and without a file
Michael Niedermayer [Sat, 13 Sep 2014 20:56:05 +0000 (22:56 +0200)]
avformat/utils: free s->pb for image2 as it can be used with and without a file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/assenc: honor ReadOrder
Clément Bœsch [Sat, 13 Sep 2014 19:06:16 +0000 (21:06 +0200)]
avformat/assenc: honor ReadOrder

9 years agoavdevice/lavfi: dont assign variables to themselfs
Michael Niedermayer [Tue, 9 Sep 2014 19:12:08 +0000 (21:12 +0200)]
avdevice/lavfi: dont assign variables to themselfs

Fixes "warning: explicitly assigning a variable of type int to itself"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix "passing argument 1 of av_free discards const qualifier from pointer target type"
Michael Niedermayer [Tue, 9 Sep 2014 19:07:58 +0000 (21:07 +0200)]
Fix "passing argument 1 of av_free discards const qualifier from pointer target type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/mpegts: Improve probe heuristic by considering the overall frequency of...
Michael Niedermayer [Sat, 13 Sep 2014 20:08:21 +0000 (22:08 +0200)]
avformat/mpegts: Improve probe heuristic by considering the overall frequency of 0x47 headers

Fixes Ticket3939

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/mjpegdec: Fix chroma width rounding
Clément Bœsch [Sat, 13 Sep 2014 18:25:27 +0000 (20:25 +0200)]
avcodec/mjpegdec: Fix chroma width rounding

Fixes vertical line at the right side
Fixes Ticket 3929

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/bmp_parser: delay frame end detection to the next header or EOF
Michael Niedermayer [Sat, 13 Sep 2014 15:46:18 +0000 (17:46 +0200)]
avcodec/bmp_parser: delay frame end detection to the next header or EOF

Fixes Ticket3687

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/bmp_parser: simplify
Michael Niedermayer [Sat, 13 Sep 2014 15:21:31 +0000 (17:21 +0200)]
avcodec/bmp_parser: simplify

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/bmp_parser: fix parsing a single bmp which has a fsize < its header
Michael Niedermayer [Sat, 13 Sep 2014 14:43:27 +0000 (16:43 +0200)]
avcodec/bmp_parser: fix parsing a single bmp which has a fsize < its header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/vobsub: fix NULL dereference
Clément Bœsch [Sat, 13 Sep 2014 13:15:32 +0000 (15:15 +0200)]
avformat/vobsub: fix NULL dereference

9 years agoavcodec/ac3en: use FF_ALLOC(Z)_ARRAY()
Michael Niedermayer [Sat, 13 Sep 2014 11:28:38 +0000 (13:28 +0200)]
avcodec/ac3en: use FF_ALLOC(Z)_ARRAY()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/format.c: use AVPROBE_SCORE_MIME instead of AVPROBE_SCORE_EXTENSION for matching...
Andreas Cadhalpun [Fri, 12 Sep 2014 16:20:08 +0000 (18:20 +0200)]
lavf/format.c: use AVPROBE_SCORE_MIME instead of AVPROBE_SCORE_EXTENSION for matching mime types

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc: document the addition of the AVProbeData.mime_type field and it's implications
Andreas Cadhalpun [Fri, 12 Sep 2014 16:18:42 +0000 (18:18 +0200)]
doc: document the addition of the AVProbeData.mime_type field and it's implications

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoconfigure: Fix miscompilation for i586
Mikulas Patocka [Fri, 12 Sep 2014 20:29:29 +0000 (22:29 +0200)]
configure: Fix miscompilation for i586

If the CPU is 386, 486 or pentium, we must not use cmov in inline
assembler.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/img2dec: Fail probing when no data is yet available and the filename contain...
Michael Niedermayer [Thu, 11 Sep 2014 14:48:03 +0000 (16:48 +0200)]
avformat/img2dec: Fail probing when no data is yet available and the filename contains no number/glob patterns either.

Fixes Ticket3901

the seek test error codes change due to a change in the failure path,
this could be avoided by changing the respective error codes to EINVAL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/format: Run image2 probe again when file content data is available
Michael Niedermayer [Thu, 11 Sep 2014 14:48:02 +0000 (16:48 +0200)]
avformat/format: Run image2 probe again when file content data is available

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/img2dec: reduce bmppipe probe score
Michael Niedermayer [Thu, 11 Sep 2014 14:48:01 +0000 (16:48 +0200)]
avformat/img2dec: reduce bmppipe probe score

bmp pipe needs the bmp parser which is not bug free and should thus not be favored
over the bmp image2 demuxer
that also means this change could be reverted in case bmp pipe is improved so it
handles all single bmp images correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodocs: add example around the suggested commit message format
James Darnley [Thu, 11 Sep 2014 23:31:26 +0000 (01:31 +0200)]
docs: add example around the suggested commit message format

It gets rendered inline in HTML and becomes not very clear.

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoconfigure: fix check_cmd in check_host_cpp
Jörg Krause [Thu, 11 Sep 2014 11:55:48 +0000 (13:55 +0200)]
configure: fix check_cmd in check_host_cpp

Use correct cpp and c flags variables for the host libc.

Signed-off-by: Jörg Krause <jkrause@posteo.de>
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/ppc/float_dsp_altivec: ppc: Fix bug in ff_vector_fmul_add_altivec() affecting...
Rong Yan [Thu, 11 Sep 2014 09:07:40 +0000 (09:07 +0000)]
avutil/ppc/float_dsp_altivec: ppc: Fix bug in ff_vector_fmul_add_altivec() affecting little endian environments on POWER8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/png_parser: Return the buffered data at the end
Michael Niedermayer [Thu, 11 Sep 2014 14:40:25 +0000 (16:40 +0200)]
avcodec/png_parser: Return the buffered data at the end

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/pngdec: print the actual number of bytes left in the error case
Michael Niedermayer [Thu, 11 Sep 2014 14:15:02 +0000 (16:15 +0200)]
avcodec/pngdec: print the actual number of bytes left in the error case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/img2_alias_pix: Add AVClass and image2 AVOptions
Michael Niedermayer [Thu, 11 Sep 2014 13:34:13 +0000 (15:34 +0200)]
avformat/img2_alias_pix: Add AVClass and image2 AVOptions

This fixes the default timebase and allows overriding the framerate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/img2_alias & brender_pix: fix function names
Michael Niedermayer [Thu, 11 Sep 2014 13:16:24 +0000 (15:16 +0200)]
avformat/img2_alias & brender_pix: fix function names

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/img2_brender_pix: Add AVClass and image2 AVOptions
Michael Niedermayer [Thu, 11 Sep 2014 13:10:59 +0000 (15:10 +0200)]
avformat/img2_brender_pix: Add AVClass and image2 AVOptions

This fixes the default timebase and allows overriding the framerate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/img2: Make AVOptions available to img* demuxers defined in other files
Michael Niedermayer [Thu, 11 Sep 2014 13:10:15 +0000 (15:10 +0200)]
avformat/img2: Make AVOptions available to img* demuxers defined in other files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/rmdec: very basic MLTI support
Michael Niedermayer [Mon, 8 Sep 2014 22:46:44 +0000 (00:46 +0200)]
avformat/rmdec: very basic MLTI support

Fixes Ticket2152

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph not...
Michael Niedermayer [Thu, 11 Sep 2014 02:55:58 +0000 (04:55 +0200)]
ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph not just when changing audio resample parameters

Fixes Ticket3562

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'
Michael Niedermayer [Wed, 10 Sep 2014 23:26:31 +0000 (01:26 +0200)]
Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'

* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
doc/ffmpeg.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/h264: Use FF_ALLOCZ_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 20:35:41 +0000 (22:35 +0200)]
avcodec/h264: Use FF_ALLOCZ_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/dnxhdenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 20:29:14 +0000 (22:29 +0200)]
avcodec/dnxhdenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/mpegvideo: Use FF_ALLOCZ_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 18:50:32 +0000 (20:50 +0200)]
avcodec/mpegvideo: Use FF_ALLOCZ_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/twinvq: Use FF_ALLOC_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 18:44:19 +0000 (20:44 +0200)]
avcodec/twinvq: Use FF_ALLOC_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc: Fix syntax and logical errors in avconv stream combination example
Diego Biurrun [Wed, 10 Sep 2014 16:38:15 +0000 (18:38 +0200)]
doc: Fix syntax and logical errors in avconv stream combination example

Bug-Id: 661
CC: libav-stable@libav.org
9 years agoavcodec/aacenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 13:06:44 +0000 (15:06 +0200)]
avcodec/aacenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/ac3enc_template: Use FF_ALLOC_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 13:06:28 +0000 (15:06 +0200)]
avcodec/ac3enc_template: Use FF_ALLOC_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/adpcmenc: Use FF_ALLOC_ARRAY_OR_GOTO()
Michael Niedermayer [Wed, 10 Sep 2014 12:37:12 +0000 (14:37 +0200)]
avcodec/adpcmenc: Use FF_ALLOC_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/concatdec: fix "warning: explicitly assigning a variable of type int to...
Michael Niedermayer [Tue, 9 Sep 2014 23:22:57 +0000 (01:22 +0200)]
avformat/concatdec: fix "warning: explicitly assigning a variable of type int to itself"

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/mp3dec: Improve seeking frame sync code
Michael Niedermayer [Sun, 7 Sep 2014 19:44:19 +0000 (21:44 +0200)]
avformat/mp3dec: Improve seeking frame sync code

Fixes Ticket3884

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoav_filter/x86/idet: use HADDD where appropriate
Pascal Massimino [Tue, 9 Sep 2014 20:49:52 +0000 (22:49 +0200)]
av_filter/x86/idet: use HADDD where appropriate

Signed-off-by: James Almer <jamrial@gmail.com>
9 years agoavformat: remove FF_API_ASS_SSA dead code
Clément Bœsch [Sun, 7 Sep 2014 19:30:38 +0000 (21:30 +0200)]
avformat: remove FF_API_ASS_SSA dead code

9 years agoavcodec/snow: make new_picture const
Michael Niedermayer [Tue, 9 Sep 2014 19:02:15 +0000 (21:02 +0200)]
avcodec/snow: make new_picture const

Fixes "assignment discards const qualifier from pointer target type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47'
Michael Niedermayer [Tue, 9 Sep 2014 17:28:59 +0000 (19:28 +0200)]
Merge commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47'

* commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47':
  dv: K&R formatting cosmetics

Conflicts:
libavcodec/dv.c
libavcodec/dv.h
libavcodec/dv_profile.c
libavcodec/dvdec.c
libavcodec/dvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23'
Michael Niedermayer [Tue, 9 Sep 2014 17:10:12 +0000 (19:10 +0200)]
Merge commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23'

* commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23':
  x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags

See: 428aa14a4851711ea1aa3f9b2d5bac867434993f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f'
Michael Niedermayer [Tue, 9 Sep 2014 17:08:08 +0000 (19:08 +0200)]
Merge commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f'

* commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f':
  x86inc: Free up variable name "n" in global namespace

See: a4dbabc8b3c123c071c925d2d749a50e4895ebcd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '176a0fca3fd64f91d585f96137388e00d8c101b6'
Michael Niedermayer [Tue, 9 Sep 2014 16:58:23 +0000 (18:58 +0200)]
Merge commit '176a0fca3fd64f91d585f96137388e00d8c101b6'

* commit '176a0fca3fd64f91d585f96137388e00d8c101b6':
  x86inc: Make ym# behave the same way as xm#

See: 720c21d11ff0742989bae3e763fc0a85a587fdb6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoav_filter/x86/idet: MMX/SSE2 implementation of 16bits filter_line()
Pascal Massimino [Tue, 9 Sep 2014 12:38:58 +0000 (14:38 +0200)]
av_filter/x86/idet: MMX/SSE2 implementation of 16bits filter_line()

tested on http://ps-auxw.de/10bit-h264-sample/10bit-eldorado.mkv
MMX: ~30% faster decoding overall
SSE2:~40% faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodv: K&R formatting cosmetics
Gabriel Dume [Mon, 8 Sep 2014 17:40:28 +0000 (13:40 -0400)]
dv: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years agoavcodec/rawenc: drop sizeof(AVFrame) dependency
Michael Niedermayer [Tue, 9 Sep 2014 11:01:37 +0000 (13:01 +0200)]
avcodec/rawenc: drop sizeof(AVFrame) dependency

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '9752d07d33d5370f7819865fbb5e582b982aad06'
Michael Niedermayer [Tue, 9 Sep 2014 10:12:29 +0000 (12:12 +0200)]
Merge commit '9752d07d33d5370f7819865fbb5e582b982aad06'

* commit '9752d07d33d5370f7819865fbb5e582b982aad06':
  dirac: K&R formatting cosmetics

Conflicts:
libavcodec/dirac.c
libavcodec/dirac_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agox86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags
Henrik Gramner [Thu, 4 Sep 2014 22:13:38 +0000 (00:13 +0200)]
x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags

Previously there was a limit of two cpuflags.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years agox86inc: Free up variable name "n" in global namespace
Loren Merritt [Thu, 4 Sep 2014 22:13:37 +0000 (00:13 +0200)]
x86inc: Free up variable name "n" in global namespace

Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years agox86inc: Make ym# behave the same way as xm#
Henrik Gramner [Thu, 4 Sep 2014 22:13:34 +0000 (00:13 +0200)]
x86inc: Make ym# behave the same way as xm#

This makes more sense for future implementations of templates with zmm registers.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years agodirac: K&R formatting cosmetics
Gabriel Dume [Mon, 8 Sep 2014 22:32:34 +0000 (18:32 -0400)]
dirac: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years agoavformat/mpeg: update comment on probe score
Michael Niedermayer [Tue, 9 Sep 2014 00:51:59 +0000 (02:51 +0200)]
avformat/mpeg: update comment on probe score

Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavdevice/x11grab: fix cursor drawing in multi-screen setup
Antonio Ospite [Mon, 8 Sep 2014 11:15:19 +0000 (13:15 +0200)]
avdevice/x11grab: fix cursor drawing in multi-screen setup

The code uses XFixes to retrieve the cursor coordinates, but XFixes
gives no information of what screen the pointer is on; this results in
always drawing the cursor on the captured screen even if the mouse
pointer was on another screen.

For example, when capturing from screen 1 (i.e. -f x11grab -i ":0.1")
the cursor was being drawn in the captured image even when the mouse
pointer was actually on screen 0, which is wrong and visually confusing.

Use XQueryPointer to check that the pointer is actually on the screen
which is being captured.

Signed-off-by: Antonio Ospite <ao2@ao2.it>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavdevice/x11grab: rename the "w" Window to "root" in paint_mouse_pointer
Antonio Ospite [Mon, 8 Sep 2014 11:15:18 +0000 (13:15 +0200)]
avdevice/x11grab: rename the "w" Window to "root" in paint_mouse_pointer

This specifies better the meaning of the variable, and is also in
preparation of a subsequent change which will introduce a temporary
Window variable for which "w" is an good name.

Signed-off-by: Antonio Ospite <ao2@ao2.it>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_cropdetect: Do not check lines or columns twice on black frames
Michael Niedermayer [Tue, 9 Sep 2014 00:06:17 +0000 (02:06 +0200)]
avfilter/vf_cropdetect: Do not check lines or columns twice on black frames

Idea from patch by: hjiodjf 97xgw46 <jfbvxt@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/mpeg: increase score for short mpeg-ps by 1
Michael Niedermayer [Sun, 7 Sep 2014 17:18:21 +0000 (19:18 +0200)]
avformat/mpeg: increase score for short mpeg-ps by 1

Fixes Ticket 3855

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '1ec335513f95bf2441f81d761ea127325ecd81a0'
Michael Niedermayer [Mon, 8 Sep 2014 20:12:57 +0000 (22:12 +0200)]
Merge commit '1ec335513f95bf2441f81d761ea127325ecd81a0'

* commit '1ec335513f95bf2441f81d761ea127325ecd81a0':
  time: Add missing zero

Conflicts:
libavutil/time.c

See: ebef9f5a56d7df91e010a177a80cfc8dbe394305

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agotime: Add missing zero
Gabriel Dume [Mon, 8 Sep 2014 19:20:42 +0000 (15:20 -0400)]
time: Add missing zero

Leftover of 56d7df91e010a177a80cfc8dbe394305

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agoavcodec/mpeg4videodec: fix 'libavcodec/mpeg4videodec.c:2762:22: warning: unused varia...
Michael Niedermayer [Mon, 8 Sep 2014 19:31:47 +0000 (21:31 +0200)]
avcodec/mpeg4videodec: fix 'libavcodec/mpeg4videodec.c:2762:22: warning: unused variable mpeg4_vdpau_class [-Wunused-const-variable]'

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