ffmpeg.git
6 years agoMerge commit '54bc15d5ebfd07fd468743ba29f709ea19e840b9'
Michael Niedermayer [Thu, 15 Jan 2015 11:58:25 +0000 (12:58 +0100)]
Merge commit '54bc15d5ebfd07fd468743ba29f709ea19e840b9'

* commit '54bc15d5ebfd07fd468743ba29f709ea19e840b9':
  id3v2: fix reading v2.2 attached pictures

Conflicts:
libavformat/id3v2.c

See: 05c3c568dccd6c42fdf6eea891d08c71fe2ee772
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '932788be5af8dee062c77851b573ea47dd6d047a'
Michael Niedermayer [Thu, 15 Jan 2015 11:53:53 +0000 (12:53 +0100)]
Merge commit '932788be5af8dee062c77851b573ea47dd6d047a'

* commit '932788be5af8dee062c77851b573ea47dd6d047a':
  id3v2: add names to the parameters of ID3v2EMFunc.read

Conflicts:
libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/id3v2: Fix incompatible pointer type warnings
Michael Niedermayer [Thu, 15 Jan 2015 11:46:13 +0000 (12:46 +0100)]
avformat/id3v2: Fix incompatible pointer type warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8809c974a3fb51f96e498a5556a4a5bbacc581ce'
Michael Niedermayer [Thu, 15 Jan 2015 11:45:20 +0000 (12:45 +0100)]
Merge commit '8809c974a3fb51f96e498a5556a4a5bbacc581ce'

* commit '8809c974a3fb51f96e498a5556a4a5bbacc581ce':
  id3v2: constify the 'tag' parameter to special metadata parsing callback

Conflicts:
libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/edgedetect: fix indent
Clément Bœsch [Thu, 15 Jan 2015 10:39:41 +0000 (11:39 +0100)]
avfilter/edgedetect: fix indent

6 years agoMerge commit 'f86f39cb9b1fcd063d5e4812132a75c06cc7acd2'
Michael Niedermayer [Thu, 15 Jan 2015 05:00:25 +0000 (06:00 +0100)]
Merge commit 'f86f39cb9b1fcd063d5e4812132a75c06cc7acd2'

* commit 'f86f39cb9b1fcd063d5e4812132a75c06cc7acd2':
  tiff: support decoding GBRP and GBRAP formats

Conflicts:
libavcodec/tiff.c

See: 379ad9788b80e05c0379adc49b26704dfd27d564
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '928061670e873e816daa14827853b7e11221ff5f'
Michael Niedermayer [Thu, 15 Jan 2015 04:46:51 +0000 (05:46 +0100)]
Merge commit '928061670e873e816daa14827853b7e11221ff5f'

* commit '928061670e873e816daa14827853b7e11221ff5f':
  libswscale: GBRAP input & output and GBRAP16 input support

Conflicts:
libswscale/input.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c
tests/ref/fate/filter-pixdesc-gbrap
tests/ref/fate/filter-pixfmts-copy
tests/ref/fate/filter-pixfmts-null
tests/ref/fate/filter-pixfmts-scale
tests/ref/fate/filter-pixfmts-vflip

See: 5c057433ccd32f37ddc828d3f82c5b1ad7d3e3db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9a4aaae3b29392b6d74997e06be249d7d54a7394'
Michael Niedermayer [Thu, 15 Jan 2015 04:35:00 +0000 (05:35 +0100)]
Merge commit '9a4aaae3b29392b6d74997e06be249d7d54a7394'

* commit '9a4aaae3b29392b6d74997e06be249d7d54a7394':
  lavc: add GBRAP to avcodec_align_dimensions2

See: 5c057433ccd32f37ddc828d3f82c5b1ad7d3e3db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a'
Michael Niedermayer [Thu, 15 Jan 2015 04:23:47 +0000 (05:23 +0100)]
Merge commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a'

* commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a':
  lavu: add planar 16 bit and 8 bit rgb with alpha

Conflicts:
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h

See: e6d4e687558d08187e7a415a7725e4b1a416f782
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e2ad0b66fa273c5c823978e8f601f2c0d9ee42f8'
Michael Niedermayer [Thu, 15 Jan 2015 03:56:32 +0000 (04:56 +0100)]
Merge commit 'e2ad0b66fa273c5c823978e8f601f2c0d9ee42f8'

* commit 'e2ad0b66fa273c5c823978e8f601f2c0d9ee42f8':
  imgutils: create misc functions for dealing with buffers

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/avpicture.c
libavutil/imgutils.c
libavutil/imgutils.h
libavutil/version.h

See: e6674e46ecdd7aaa93d7f7d818eb1c8224b35eae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mov: Do not set aspect ratios that would contain zeros
Michael Niedermayer [Thu, 15 Jan 2015 03:26:16 +0000 (04:26 +0100)]
avformat/mov: Do not set aspect ratios that would contain zeros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mov: rewrite aspect from matrix code
Michael Niedermayer [Thu, 15 Jan 2015 03:20:43 +0000 (04:20 +0100)]
avformat/mov: rewrite aspect from  matrix code

The original code was intended purely for rotation == 0
In cf70ba37ba74089a18295b29e77dead0a3222c9e the condition was
changed to use it only for rotation != 0
which broke the cases for which it was intended to be used
as well as breaking cases for which it was not intended to be
used.
This changes the code so it could work for the more general
case and fixes the regressions
If you have sample files that are not handled correctly
please open tickets or mail me!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'cf70ba37ba74089a18295b29e77dead0a3222c9e'
Michael Niedermayer [Thu, 15 Jan 2015 02:02:14 +0000 (03:02 +0100)]
Merge commit 'cf70ba37ba74089a18295b29e77dead0a3222c9e'

* commit 'cf70ba37ba74089a18295b29e77dead0a3222c9e':
  mov: Check angle rather than full matrix when updating SAR

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1e763454322f7fbc7799f6009bf2e11d7a3b9821'
Michael Niedermayer [Thu, 15 Jan 2015 01:52:47 +0000 (02:52 +0100)]
Merge commit '1e763454322f7fbc7799f6009bf2e11d7a3b9821'

* commit '1e763454322f7fbc7799f6009bf2e11d7a3b9821':
  png: improve signature check

Conflicts:
libavcodec/pngdec.c

See: 8a08503b78f59d61cf98b9deb99363e3e07d8599
See: 0a3589bf2f0a23b0eb68664fbb00078abe882a88
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '456ffec35d55288d589aa1901919e038c3427f30'
Michael Niedermayer [Thu, 15 Jan 2015 01:05:17 +0000 (02:05 +0100)]
Merge commit '456ffec35d55288d589aa1901919e038c3427f30'

* commit '456ffec35d55288d589aa1901919e038c3427f30':
  img2dec: correctly use the parsed value from -start_number

No change, start_number works fine without this change
and does not work with it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add qp filter test
Michael Niedermayer [Wed, 14 Jan 2015 19:43:17 +0000 (20:43 +0100)]
fate: add qp filter test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter: port qp filter from libmpcodecs
Paul B Mahol [Wed, 18 Sep 2013 23:57:55 +0000 (23:57 +0000)]
avfilter: port qp filter from libmpcodecs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoid3v2: fix reading v2.2 attached pictures
Anton Khirnov [Sat, 10 Jan 2015 08:39:34 +0000 (09:39 +0100)]
id3v2: fix reading v2.2 attached pictures

In v2.2, the picture type is not a zero-terminated string, but has a
constant size of 3 bytes.

6 years agoid3v2: add names to the parameters of ID3v2EMFunc.read
Anton Khirnov [Sat, 10 Jan 2015 08:39:33 +0000 (09:39 +0100)]
id3v2: add names to the parameters of ID3v2EMFunc.read

Some of them are not immediately obvious.

6 years agoid3v2: constify the 'tag' parameter to special metadata parsing callback
Anton Khirnov [Sat, 10 Jan 2015 08:39:32 +0000 (09:39 +0100)]
id3v2: constify the 'tag' parameter to special metadata parsing callback

Those functions should not ever modify it.

6 years agotiff: support decoding GBRP and GBRAP formats
Paul B Mahol [Wed, 17 Dec 2014 13:54:44 +0000 (14:54 +0100)]
tiff: support decoding GBRP and GBRAP formats

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agolibswscale: GBRAP input & output and GBRAP16 input support
Paul B Mahol [Wed, 17 Dec 2014 13:54:43 +0000 (14:54 +0100)]
libswscale: GBRAP input & output and GBRAP16 input support

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agolavc: add GBRAP to avcodec_align_dimensions2
Paul B Mahol [Wed, 17 Dec 2014 13:54:42 +0000 (14:54 +0100)]
lavc: add GBRAP to avcodec_align_dimensions2

6 years agolavu: add planar 16 bit and 8 bit rgb with alpha
Paul B Mahol [Wed, 17 Dec 2014 13:54:41 +0000 (14:54 +0100)]
lavu: add planar 16 bit and 8 bit rgb with alpha

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agoimgutils: create misc functions for dealing with buffers
Stefano Sabatini [Wed, 10 Dec 2014 12:20:49 +0000 (12:20 +0000)]
imgutils: create misc functions for dealing with buffers

Move the lavc/imgconvert functions and rename them as follows:
  avpicture_get_size -> av_image_get_buffer_size()
  avpicture_fill     -> av_image_fill_arrays()
  avpicture_layout   -> av_image_copy_to_buffer()

The new functions have an align parameter, which allows to define the
linesize alignment assumed in the buffer (which is set or read).

The names of the functions are consistent with the lavu/samples API
(av_samples_get_buffer_size(), av_samples_fill_arrays()).

A redundant check has been dropped from av_image_fill_arrays().

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agomov: Check angle rather than full matrix when updating SAR
Vittorio Giovara [Fri, 9 Jan 2015 10:24:22 +0000 (11:24 +0100)]
mov: Check angle rather than full matrix when updating SAR

When the display matrix is not the identity one, but the rotation angle
is zero, there is no need to update the sample aspect ratio.

Otherwise, it is possible to obtain negative values which interferes
with transcoding in later stages. This kind of behaviour is reproducible
on mov files with "major_brand: MSNV".

CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agopng: improve signature check
Vittorio Giovara [Mon, 12 Jan 2015 22:55:45 +0000 (23:55 +0100)]
png: improve signature check

Return proper error code, print an error message and add missing
parentheses.

6 years agoimg2dec: correctly use the parsed value from -start_number
Vittorio Giovara [Tue, 6 Jan 2015 15:47:18 +0000 (16:47 +0100)]
img2dec: correctly use the parsed value from -start_number

Previously the image sequence was always starting from the minimum
number rather than the requested one.

CC: libav-stable@libav.org
6 years agoavcodec/sunrast: Use av_malloc_array()
Michael Niedermayer [Wed, 14 Jan 2015 12:35:11 +0000 (13:35 +0100)]
avcodec/sunrast: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/svq3: Use av_mallocz_array() for emu_edge_buffer
Michael Niedermayer [Wed, 14 Jan 2015 12:23:57 +0000 (13:23 +0100)]
avcodec/svq3: Use av_mallocz_array() for emu_edge_buffer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/svq3: Check av_mallocs return value
Michael Niedermayer [Wed, 14 Jan 2015 12:23:20 +0000 (13:23 +0100)]
avcodec/svq3: Check av_mallocs return value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegts: identify h264 mvc streams
Hendrik Leppkes [Sat, 26 May 2012 11:49:41 +0000 (13:49 +0200)]
mpegts: identify h264 mvc streams

This fixes missdetecting such streams as something else like AAC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/smoothstreamingenc: Add missing "goto fail"
Michael Niedermayer [Tue, 13 Jan 2015 23:17:52 +0000 (00:17 +0100)]
avformat/smoothstreamingenc: Add missing "goto fail"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mpeg: Avoid dead assignment
Michael Niedermayer [Tue, 13 Jan 2015 23:06:43 +0000 (00:06 +0100)]
avformat/mpeg: Avoid dead assignment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: Fix handling of skipped_bytes() reallocation failures
Michael Niedermayer [Tue, 13 Jan 2015 17:51:33 +0000 (18:51 +0100)]
avcodec/hevc: Fix handling of skipped_bytes() reallocation failures

Fixes CID1260704

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoqpeg: avoid pointless invalid memcpy()
wm4 [Tue, 13 Jan 2015 13:47:47 +0000 (14:47 +0100)]
qpeg: avoid pointless invalid memcpy()

If refdata was NULL, the memcpy() ended up copying the same memory
block onto itself, which is not only pointless, but also undefined
behavior.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/roqvideoenc: Check for av_malloc_array() failure
Michael Niedermayer [Tue, 13 Jan 2015 14:14:27 +0000 (15:14 +0100)]
avcodec/roqvideoenc: Check for av_malloc_array() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snowenc-test: use av_mallocz_array()
Michael Niedermayer [Tue, 13 Jan 2015 14:04:15 +0000 (15:04 +0100)]
avcodec/snowenc-test: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snowenc-test: check for av_malloc*() failures
Michael Niedermayer [Tue, 13 Jan 2015 14:02:36 +0000 (15:02 +0100)]
avcodec/snowenc-test: check for av_malloc*() failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoChangelog: mention the port of various mp PP filters
Stefano Sabatini [Tue, 13 Jan 2015 12:12:19 +0000 (13:12 +0100)]
Changelog: mention the port of various mp PP filters

6 years agolavfi: remove mp=pp7
Arwa Arif [Fri, 9 Jan 2015 19:51:14 +0000 (01:21 +0530)]
lavfi: remove mp=pp7

The filter was ported to a native libavfilter filter in
a299cd5ab3567bdf855dc84cdbed4d22ea5fcbb6.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavfi: use ff_norm_qscale(), factorize
Stefano Sabatini [Tue, 13 Jan 2015 12:00:18 +0000 (13:00 +0100)]
lavfi: use ff_norm_qscale(), factorize

6 years agolibavformat/mxfdec.c: export the full UMID as metadata
Mark Reid [Sat, 10 Jan 2015 02:05:27 +0000 (18:05 -0800)]
libavformat/mxfdec.c: export the full UMID as metadata

Previous version reviewed-by: tim nicholson

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/shorten: use av_reallocp_array()
Michael Niedermayer [Mon, 12 Jan 2015 22:27:18 +0000 (23:27 +0100)]
avcodec/shorten: use av_reallocp_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snow: Fix av_malloc* failure checks
Michael Niedermayer [Mon, 12 Jan 2015 22:15:32 +0000 (23:15 +0100)]
avcodec/snow: Fix av_malloc* failure checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snow: Use av_malloc_array()
Michael Niedermayer [Mon, 12 Jan 2015 22:14:40 +0000 (23:14 +0100)]
avcodec/snow: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/opus_imdct: Use av_malloc_array()
Michael Niedermayer [Mon, 12 Jan 2015 22:11:44 +0000 (23:11 +0100)]
avcodec/opus_imdct: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavformat/mxfdec.c: read project_name metadata
Mark Reid [Tue, 6 Jan 2015 00:53:05 +0000 (16:53 -0800)]
libavformat/mxfdec.c: read project_name metadata

MXF files generated by Media Composer or LibMXF can contain a
project name property in the Preface. Lots of existing samples have them.

http://samples.ffmpeg.org/MXF/issue2160/PW0805A0V01.4C5B5636.EFA330.mxf
project_name    : DNX145 PW Test

http://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket3450/WriteAvidMXFgenerated/5502_0010_v1.mxf
project_name    : Rombus

http://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket3100/1sec_mxf_test_Video5270C795.mxf
project_name    : NVB_DOOD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/swr: add SSE/AVX unpack_6ch functions
James Almer [Mon, 12 Jan 2015 18:32:24 +0000 (15:32 -0300)]
x86/swr: add SSE/AVX unpack_6ch functions

int32/float only

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agodoc/general: update libilbc link
Lou Logan [Mon, 12 Jan 2015 18:32:06 +0000 (09:32 -0900)]
doc/general: update libilbc link

Signed-off-by: Lou Logan <lou@lrcd.com>
6 years agoavutil/opencl: don't include config.h
James Almer [Mon, 12 Jan 2015 16:48:52 +0000 (13:48 -0300)]
avutil/opencl: don't include config.h

It's not an installed header.

Tested-by: Thilo Borgmann <thilo.borgmann@mail.de>
Tested-by: Wei Gao <highgod0401@gmail.com>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoavcodec/wma: Print more details in case of spectral RLE overflows
Michael Niedermayer [Mon, 12 Jan 2015 12:56:13 +0000 (13:56 +0100)]
avcodec/wma: Print more details in case of spectral RLE overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ccaption_dec: Fix typos and cosmetics
Michael Niedermayer [Mon, 12 Jan 2015 12:43:53 +0000 (13:43 +0100)]
avcodec/ccaption_dec: Fix typos and cosmetics

Found-by: ubitux
(rest of found stuff left to the author to decide which way to fix)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/wmadec: fix 0 frame bit_reservoir
Michael Niedermayer [Mon, 12 Jan 2015 00:51:06 +0000 (01:51 +0100)]
avcodec/wmadec: fix 0 frame bit_reservoir

Fixes Ticket968
partly fixes Ticket691

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/wmadec: also print the number of bits left in the nb_frames <= 0 case
Michael Niedermayer [Mon, 12 Jan 2015 00:48:32 +0000 (01:48 +0100)]
avcodec/wmadec: also print the number of bits left in the nb_frames <= 0 case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/codecs: document nomc flag
Michael Niedermayer [Mon, 12 Jan 2015 00:18:01 +0000 (01:18 +0100)]
doc/codecs: document nomc flag

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdding Closed caption accessories
Anshul Maheshwari [Tue, 6 Jan 2015 06:55:41 +0000 (12:25 +0530)]
Adding Closed caption accessories

Signed-off-by: Anshul Maheshwari <anshul.ffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdding Closed caption Support
Anshul Maheshwari [Tue, 6 Jan 2015 06:53:34 +0000 (12:23 +0530)]
Adding Closed caption Support

Signed-off-by: Anshul Maheshwari <anshul.ffmpeg@gmail.com>
To test Closed caption use following command
ffmpeg -f lavfi -i "movie=input.ts[out0+subcc]" -map s output.srt
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: use av_match_name to filter devices
Lukasz Marek [Sun, 21 Dec 2014 21:42:10 +0000 (22:42 +0100)]
cmdutils: use av_match_name to filter devices

Device name may be coma-separated list.
Use dedicated funtion to compare.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
6 years agolavd/v4l2: implement list device callback
Lukasz Marek [Sun, 21 Dec 2014 21:37:18 +0000 (22:37 +0100)]
lavd/v4l2: implement list device callback

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
6 years agocmdutils: use helper functions for listing sinks/sources
Lukasz Marek [Sun, 14 Dec 2014 23:31:42 +0000 (00:31 +0100)]
cmdutils: use helper functions for listing sinks/sources

List device callback must be able to return valid list without opening device.
This callback should return input values for open function, not vice-versa.
Read header funtion is very likey to fail without proper configuration provided.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
6 years agolavd/avdevice: introduce helper functions for sink/sources listing
Lukasz Marek [Sun, 21 Dec 2014 19:12:47 +0000 (20:12 +0100)]
lavd/avdevice: introduce helper functions for sink/sources listing

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
6 years agolavd/avdevice: remove av_ prefix from private function
Lukasz Marek [Sat, 20 Dec 2014 16:15:29 +0000 (17:15 +0100)]
lavd/avdevice: remove av_ prefix from private function

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
6 years agoavcodec/error_resilience: Remove special case for H.264 from is_intra_more_likely
Michael Niedermayer [Sun, 11 Jan 2015 16:00:37 +0000 (17:00 +0100)]
avcodec/error_resilience: Remove special case for H.264 from is_intra_more_likely

This should not be needed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: Keep a reference to the last picture for EC
Michael Niedermayer [Sun, 11 Jan 2015 15:40:27 +0000 (16:40 +0100)]
avcodec/h264: Keep a reference to the last picture for EC

This and the next commit improve error concealment for
green-block-artifacts-from-canon-100-hs.MOV

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/options_table: add entries for MPEG4 video profiles
Michael Niedermayer [Mon, 29 Dec 2014 01:13:28 +0000 (02:13 +0100)]
avcodec/options_table: add entries for MPEG4 video profiles

Fixes part of Ticket2901

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/proresdec_lgpl: Use av_malloc_array()
Michael Niedermayer [Sun, 11 Jan 2015 12:42:06 +0000 (13:42 +0100)]
avcodec/proresdec_lgpl: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/pgssubdec: Use av_malloc*_array()
Michael Niedermayer [Sun, 11 Jan 2015 12:41:14 +0000 (13:41 +0100)]
avcodec/pgssubdec: Use av_malloc*_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libvo-aacenc: Use av_mallocz_array()
Michael Niedermayer [Sun, 11 Jan 2015 12:32:55 +0000 (13:32 +0100)]
avcodec/libvo-aacenc: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoHandle r10k endianess atom DpxE.
Carl Eugen Hoyos [Sun, 11 Jan 2015 11:11:36 +0000 (12:11 +0100)]
Handle r10k endianess atom DpxE.

Fixes playback and remuxing of r10k_full-range_big-endian.mov.

Reported, analyzed and tested by Olaf Matthes, olaf matthes gmx de

6 years agoavformat/hlsenc: more robust error tests
Michael Niedermayer [Sun, 11 Jan 2015 03:58:29 +0000 (04:58 +0100)]
avformat/hlsenc: more robust error tests

errors are negative throughout ffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/swr: load constants outside the loop in pack_6ch functions
James Almer [Sat, 10 Jan 2015 22:21:52 +0000 (19:21 -0300)]
x86/swr: load constants outside the loop in pack_6ch functions

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoavformat/voc: add seeking support
Michael Niedermayer [Sat, 10 Jan 2015 23:16:41 +0000 (00:16 +0100)]
avformat/voc: add seeking support

Fixes Ticket1333

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libvpxenc.c: Fix linking with codec interface with msvc.
Matt Oliver [Sat, 10 Jan 2015 11:19:08 +0000 (22:19 +1100)]
avcodec/libvpxenc.c: Fix linking with codec interface with msvc.

Default libvpx msvc buils used module definition to export symbols.
These symbols are exported as pointers to data which dont link when
referenced directly.

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: avoid infinite loop with broken files
wm4 [Sat, 10 Jan 2015 17:00:08 +0000 (18:00 +0100)]
vp9: avoid infinite loop with broken files

With a certain fuzzed file, the parser will always return 0 consumed
bytes, which makes calling code call the parser infinitely. Return the
full packet size on error instead. (Here it would be nice if parsers
could return errors at all.)

Additionally, _if_ there's some data left, return that too, which might
help with somewhat broken but still somehow playable files.

Fixes ticket #4242.

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ratecontrol: Check for av_malloc*() failures
Michael Niedermayer [Sat, 10 Jan 2015 18:29:39 +0000 (19:29 +0100)]
avcodec/ratecontrol: Check for av_malloc*() failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/dvbsubdec: Return proper error codes from more functions
Michael Niedermayer [Sat, 10 Jan 2015 18:24:27 +0000 (19:24 +0100)]
avcodec/dvbsubdec: Return proper error codes from more functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/dvbsubdec: Add some av_malloc() failure checks
Michael Niedermayer [Sat, 10 Jan 2015 18:18:59 +0000 (19:18 +0100)]
avcodec/dvbsubdec: Add some av_malloc() failure checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/diracdec: Check slices malloc and propagate error code
Michael Niedermayer [Sat, 10 Jan 2015 16:25:05 +0000 (17:25 +0100)]
avcodec/diracdec: Check slices malloc and propagate error code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_pp7: Add GBRP pixel format
Michael Niedermayer [Sat, 10 Jan 2015 15:05:59 +0000 (16:05 +0100)]
avfilter/vf_pp7: Add GBRP pixel format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_pp7: use av_malloc_array()
Michael Niedermayer [Sat, 10 Jan 2015 15:03:46 +0000 (16:03 +0100)]
avfilter/vf_pp7: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoLICENSE.md: mention mpdecimate and not decimate to be GPL
Paul B Mahol [Sat, 10 Jan 2015 13:32:55 +0000 (13:32 +0000)]
LICENSE.md: mention mpdecimate and not decimate to be GPL

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/cavs: Check for av_malloc* failure in ff_cavs_init_top_lines()
Michael Niedermayer [Sat, 10 Jan 2015 12:59:46 +0000 (13:59 +0100)]
avcodec/cavs: Check for av_malloc* failure in ff_cavs_init_top_lines()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/movenc: move variable to a more local block
Michael Niedermayer [Sat, 10 Jan 2015 03:50:50 +0000 (04:50 +0100)]
avformat/movenc: move variable to a more local block

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples: fix lib math dep for decoding_encoding
Andreas Cadhalpun [Fri, 9 Jan 2015 16:50:27 +0000 (17:50 +0100)]
doc/examples: fix lib math dep for decoding_encoding

It uses at least sin().

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: enable vsx together with altivec for ppc64el
Andreas Cadhalpun [Fri, 9 Jan 2015 16:32:09 +0000 (17:32 +0100)]
configure: enable vsx together with altivec for ppc64el

The altivec optimizations on little endian ppc64 don't work without vsx.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/movenc: workaround bug in "PathScale EKOPath(tm) Compiler Suite Version...
Michael Niedermayer [Sat, 10 Jan 2015 02:43:54 +0000 (03:43 +0100)]
avformat/movenc: workaround bug in "PathScale EKOPath(tm) Compiler Suite Version 4.0.12.1"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/internal: add fixme to ff_norm_qscale() to document obvious scaling issue
Michael Niedermayer [Sat, 10 Jan 2015 01:27:49 +0000 (02:27 +0100)]
avfilter/internal: add fixme to ff_norm_qscale() to document obvious scaling issue

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter: Factorize the use of norm_qscale in pp7
Arwa Arif [Fri, 9 Jan 2015 20:13:42 +0000 (01:43 +0530)]
avfilter: Factorize the use of norm_qscale in pp7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agorm: fix memory leak on init failure
wm4 [Fri, 9 Jan 2015 20:24:54 +0000 (21:24 +0100)]
rm: fix memory leak on init failure

AVInputFormat.read_close is not called if AVInputFormat.read_header
fails, so this needs to be handled separately.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffserver: Use av_malloc_array()
Michael Niedermayer [Tue, 6 Jan 2015 16:55:50 +0000 (17:55 +0100)]
ffserver: Use av_malloc_array()

Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/vf_pp7: port dctB_mmx to yasm
James Almer [Fri, 9 Jan 2015 19:51:13 +0000 (16:51 -0300)]
x86/vf_pp7: port dctB_mmx to yasm

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoMerge commit '51da7d02748cc54b7d009115e76efa940b99a8ef'
Michael Niedermayer [Fri, 9 Jan 2015 20:25:26 +0000 (21:25 +0100)]
Merge commit '51da7d02748cc54b7d009115e76efa940b99a8ef'

* commit '51da7d02748cc54b7d009115e76efa940b99a8ef':
  matroskaenc: refuse to write AAC without valid extradata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7e4e010b80e76862e83afbd41c25d50e72f0b44c'
Michael Niedermayer [Fri, 9 Jan 2015 19:51:17 +0000 (20:51 +0100)]
Merge commit '7e4e010b80e76862e83afbd41c25d50e72f0b44c'

* commit '7e4e010b80e76862e83afbd41c25d50e72f0b44c':
  mpeg4audio: check the init_get_bits() return value

Conflicts:
libavcodec/mpeg4audio.c

See: deefdf9788467edd262b9c29a4f6e33d2ae84b8c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ass_split: use *alloc_array()
Michael Niedermayer [Fri, 9 Jan 2015 19:20:00 +0000 (20:20 +0100)]
avcodec/ass_split: use *alloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ass: Use av_realloc_array()
Michael Niedermayer [Fri, 9 Jan 2015 17:57:37 +0000 (18:57 +0100)]
avcodec/ass: Use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: port mp=pp7 to libavfilter
Arwa Arif [Thu, 25 Dec 2014 04:20:24 +0000 (09:50 +0530)]
lavfi: port mp=pp7 to libavfilter

The only difference with mp=pp7 is that default mode is "medium", as stated
in the MPlayer docs, rather than "hard".

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agoavformat/hdsenc: Remove redundant NULL pointer checks
Michael Niedermayer [Fri, 9 Jan 2015 14:54:15 +0000 (15:54 +0100)]
avformat/hdsenc: Remove redundant NULL pointer checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: remove unneeded NULL pointer check
Michael Niedermayer [Fri, 9 Jan 2015 14:51:32 +0000 (15:51 +0100)]
ffmpeg: remove unneeded NULL pointer check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotools/uncoded_frame: Use avio_closep() to avoid leaving stale pointers in memory
Michael Niedermayer [Fri, 9 Jan 2015 14:46:13 +0000 (15:46 +0100)]
tools/uncoded_frame: Use avio_closep() to avoid leaving stale pointers in memory

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