ffmpeg.git
4 years agoavfilter/showcqt: add gamma2 option
Muhammad Faiz [Sat, 17 Jan 2015 15:52:11 +0000 (22:52 +0700)]
avfilter/showcqt: add gamma2 option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo_parser: Check the ff_set_dimensions() return code
Michael Niedermayer [Sun, 18 Jan 2015 03:46:03 +0000 (04:46 +0100)]
avcodec/mpegvideo_parser: Check the ff_set_dimensions() return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo_parser: more robust dimension setup
Michael Niedermayer [Sun, 18 Jan 2015 03:39:41 +0000 (04:39 +0100)]
avcodec/mpegvideo_parser: more robust dimension setup

Before this missing seq headers could have led to wrong dimensions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/sbgdec: remove double ;;
Clément Bœsch [Sat, 17 Jan 2015 23:36:56 +0000 (00:36 +0100)]
avformat/sbgdec: remove double ;;

4 years agoavdevice/pulse_audio_dec: remove double ;;
Clément Bœsch [Sat, 17 Jan 2015 23:35:04 +0000 (00:35 +0100)]
avdevice/pulse_audio_dec: remove double ;;

4 years agoavcodec/vp8: remove double ;;
Clément Bœsch [Sat, 17 Jan 2015 23:34:19 +0000 (00:34 +0100)]
avcodec/vp8: remove double ;;

4 years agoavcodec/tiffenc: remove double ;;
Clément Bœsch [Sat, 17 Jan 2015 23:33:02 +0000 (00:33 +0100)]
avcodec/tiffenc: remove double ;;

4 years agoavformat/asfdec: Check the av_get_packet() return value
Michael Niedermayer [Sat, 17 Jan 2015 19:39:43 +0000 (20:39 +0100)]
avformat/asfdec: Check the av_get_packet() return value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rtpdec_hevc: Fix 2 "may be used uninitialized in this function" warnings
Michael Niedermayer [Sat, 17 Jan 2015 19:27:31 +0000 (20:27 +0100)]
avformat/rtpdec_hevc: Fix 2 "may be used uninitialized in this function" warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/nvenc: Add support for nvenc api version 5
Timo Rothenpieler [Fri, 16 Jan 2015 00:02:40 +0000 (01:02 +0100)]
avcodec/nvenc: Add support for nvenc api version 5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dvbsubdec: Check get_region() return value
Michael Niedermayer [Sat, 17 Jan 2015 15:21:36 +0000 (16:21 +0100)]
avcodec/dvbsubdec: Check get_region() return value

Fixes null pointer dereference with DEBUG enabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/nsvdec: Check av_get_packet() return value
Michael Niedermayer [Sat, 17 Jan 2015 15:05:08 +0000 (16:05 +0100)]
avformat/nsvdec: Check av_get_packet() return value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_frei0r: fix build with DEBUG enabled
Michael Niedermayer [Sat, 17 Jan 2015 14:41:23 +0000 (15:41 +0100)]
avfilter/vf_frei0r: fix build with DEBUG enabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_frei0r: also set AVFilterLink.frame_rate
Michael Niedermayer [Sat, 17 Jan 2015 13:46:21 +0000 (14:46 +0100)]
avfilter/vf_frei0r: also set AVFilterLink.frame_rate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mss12: Use av_malloc_array()
Michael Niedermayer [Sat, 17 Jan 2015 12:01:26 +0000 (13:01 +0100)]
avcodec/mss12: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libopusenc: Use av_mallocz_array()
Michael Niedermayer [Sat, 17 Jan 2015 11:58:56 +0000 (12:58 +0100)]
avcodec/libopusenc: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libmp3lame: use av_malloc_array()
Michael Niedermayer [Sat, 17 Jan 2015 11:56:19 +0000 (12:56 +0100)]
avcodec/libmp3lame: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/flac_parser: fix handling EOF if no headers are found
Michael Niedermayer [Sat, 17 Jan 2015 00:56:03 +0000 (01:56 +0100)]
avcodec/flac_parser: fix handling EOF if no headers are found

Fixes assertion failure
Fixes Ticket4269

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/flac_parser: print error messages in case of errors
Michael Niedermayer [Sat, 17 Jan 2015 00:40:39 +0000 (01:40 +0100)]
avcodec/flac_parser: print error messages in case of errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix precission typos
Michael Niedermayer [Fri, 16 Jan 2015 21:42:42 +0000 (22:42 +0100)]
Fix precission typos

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_framepack: Check and update frame_rate
Michael Niedermayer [Fri, 16 Jan 2015 20:36:26 +0000 (21:36 +0100)]
avfilter/vf_framepack: Check and update frame_rate

The frame_rate update was missing leaving the output frame rate
wrong.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: Use filter graph output frame rate also for frame duration estimation
Michael Niedermayer [Fri, 16 Jan 2015 19:15:15 +0000 (20:15 +0100)]
ffmpeg: Use filter graph output frame rate also for frame duration estimation

Previously the duration was sometimes wrong, this addition
limits the value and improves which frames are choosen when
reducing the frame rate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: Maintain higher precision pts between video filter and fps code
Michael Niedermayer [Fri, 16 Jan 2015 16:03:35 +0000 (17:03 +0100)]
ffmpeg: Maintain higher precision pts between video filter and fps code

This is a bit ugly as it attempts to keep most of the computation
in integers before the double based fps code. The use of integers
is to reduce the chances of rounding differences between platforms

Previously the timestamp was rounded to the encoder timebase
before being converted back to double precision which could cause loss
of precision

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: drop redundant frame_pts value
Michael Niedermayer [Fri, 16 Jan 2015 15:32:50 +0000 (16:32 +0100)]
ffmpeg: drop redundant frame_pts value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3941df546276b190cc9362fd093e6721e8e52f50'
Michael Niedermayer [Fri, 16 Jan 2015 13:20:12 +0000 (14:20 +0100)]
Merge commit '3941df546276b190cc9362fd093e6721e8e52f50'

* commit '3941df546276b190cc9362fd093e6721e8e52f50':
  aea: Return proper error code on invalid header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2df7277711cbe3ca5415ff8e31228dcffa309211'
Michael Niedermayer [Fri, 16 Jan 2015 12:10:04 +0000 (13:10 +0100)]
Merge commit '2df7277711cbe3ca5415ff8e31228dcffa309211'

* commit '2df7277711cbe3ca5415ff8e31228dcffa309211':
  swscale: fix gbrap to gbrap alpha scaling

Conflicts:
libswscale/input.c
tests/ref/fate/filter-pixfmts-scale

Not merged, the code works fine as is and does not work with this
change

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '89df3fd49e9992441f680326902b4912d79f514f'
Michael Niedermayer [Fri, 16 Jan 2015 11:34:47 +0000 (12:34 +0100)]
Merge commit '89df3fd49e9992441f680326902b4912d79f514f'

* commit '89df3fd49e9992441f680326902b4912d79f514f':
  swscale: fix warning about incompatible function pointer type

Not merged, this change is incorrect for FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoaea: Return proper error code on invalid header
Nidhi Makhijani [Thu, 15 Jan 2015 12:50:03 +0000 (18:20 +0530)]
aea: Return proper error code on invalid header

4 years agoffmpeg: improve data stream support
Anshul Maheshwari [Fri, 16 Jan 2015 01:19:01 +0000 (02:19 +0100)]
ffmpeg: improve data stream support

This adds data codec/stream handling where previously there was only
audio/video/subtitles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale: fix gbrap to gbrap alpha scaling
Vittorio Giovara [Thu, 15 Jan 2015 14:15:22 +0000 (15:15 +0100)]
swscale: fix gbrap to gbrap alpha scaling

4 years agoswscale: fix warning about incompatible function pointer type
Vittorio Giovara [Thu, 15 Jan 2015 14:15:21 +0000 (15:15 +0100)]
swscale: fix warning about incompatible function pointer type

4 years agoavformat: Improve data streams/codec support
Anshul Maheshwari [Fri, 16 Jan 2015 01:00:23 +0000 (02:00 +0100)]
avformat: Improve data streams/codec support

This adds data codec/stream handling where previously there was only
audio/video/subtitles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice: Use av_format_get_control_message_cb()
Michael Niedermayer [Fri, 16 Jan 2015 01:10:35 +0000 (02:10 +0100)]
avdevice: Use av_format_get_control_message_cb()

This is required as the location of this field could change and is
specified in libavformat not avdevice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: Add bitrate value under -progress action
raxon1s [Thu, 8 Jan 2015 02:50:15 +0000 (03:50 +0100)]
ffmpeg: Add bitrate value under -progress action

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/g2meet: Use av_mallocz_array() for framebuffer allocation
Michael Niedermayer [Thu, 15 Jan 2015 22:04:59 +0000 (23:04 +0100)]
avcodec/g2meet: Use av_mallocz_array() for framebuffer allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/g722enc: Use av_mallocz_array()
Michael Niedermayer [Thu, 15 Jan 2015 22:02:43 +0000 (23:02 +0100)]
avcodec/g722enc: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/flashsv2enc: use av_realloc_array()
Michael Niedermayer [Thu, 15 Jan 2015 22:00:52 +0000 (23:00 +0100)]
avcodec/flashsv2enc: use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/parser: Check that the parser return code is valid
Michael Niedermayer [Fri, 9 Jan 2015 12:02:44 +0000 (13:02 +0100)]
avcodec/parser: Check that the parser return code is valid

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/flac_parser: Check for av_malloc() failure
Michael Niedermayer [Thu, 15 Jan 2015 15:51:08 +0000 (16:51 +0100)]
avcodec/flac_parser: Check for av_malloc() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/flac_parser: Use sizeof(variable) instead of sizeof(type)
Michael Niedermayer [Thu, 15 Jan 2015 15:48:54 +0000 (16:48 +0100)]
avcodec/flac_parser: Use sizeof(variable) instead of sizeof(type)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: Support the AV_PIX_FMT_GBRAP* formats with AV_HAVE_INCOMPATIBLE_LIBAV_ABI
Michael Niedermayer [Thu, 15 Jan 2015 15:43:38 +0000 (16:43 +0100)]
avutil/pixfmt: Support the AV_PIX_FMT_GBRAP* formats with AV_HAVE_INCOMPATIBLE_LIBAV_ABI

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: Document the duplicated AV_PIX_FMT_GBRAP* formats
Michael Niedermayer [Thu, 15 Jan 2015 15:41:15 +0000 (16:41 +0100)]
avutil/pixfmt: Document the duplicated AV_PIX_FMT_GBRAP* formats

This is similar to the other duplicated cases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/id3v2: remove unused variable
Michael Niedermayer [Thu, 15 Jan 2015 15:36:14 +0000 (16:36 +0100)]
avformat/id3v2: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: fix showpalette position
Clément Bœsch [Thu, 15 Jan 2015 15:40:02 +0000 (16:40 +0100)]
doc: fix showpalette position

4 years agoavfilter: add showpalette filter
Clément Bœsch [Thu, 15 Jan 2015 10:39:06 +0000 (11:39 +0100)]
avfilter: add showpalette filter

4 years agoavcodec/nvenc: fix b frame settings
agathah [Wed, 7 Jan 2015 09:19:32 +0000 (17:19 +0800)]
avcodec/nvenc: fix b frame settings

Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e'
Michael Niedermayer [Thu, 15 Jan 2015 13:45:01 +0000 (14:45 +0100)]
Merge commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e'

* commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e':
  rtmppkt: Repeat the full 32 bit timestamp for chunking continuation packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'def69553e745e007925147b2e7e4b32c57d08fdf'
Michael Niedermayer [Thu, 15 Jan 2015 13:31:33 +0000 (14:31 +0100)]
Merge commit 'def69553e745e007925147b2e7e4b32c57d08fdf'

* commit 'def69553e745e007925147b2e7e4b32c57d08fdf':
  h264_cabac: Break infinite loops

Conflicts:
libavcodec/h264_cabac.c

See: cdf0877bc341684c56ac1fe057397adbadf329ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '402fb5550e36dd994b13941ef5499f9087afd345'
Michael Niedermayer [Thu, 15 Jan 2015 12:54:29 +0000 (13:54 +0100)]
Merge commit '402fb5550e36dd994b13941ef5499f9087afd345'

* commit '402fb5550e36dd994b13941ef5499f9087afd345':
  opus_parser: drop unused variable

See: 74141f693ded2fbf75af56fff309d2db35183635
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8a9641a652ed1546fedfda22584f79d3d423096e'
Michael Niedermayer [Thu, 15 Jan 2015 12:47:12 +0000 (13:47 +0100)]
Merge commit '8a9641a652ed1546fedfda22584f79d3d423096e'

* commit '8a9641a652ed1546fedfda22584f79d3d423096e':
  bsf: check memory allocations

Conflicts:
libavcodec/noise_bsf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '014b6b416fec89777cb9cff61bcf7896eaf7cf39'
Michael Niedermayer [Thu, 15 Jan 2015 12:10:37 +0000 (13:10 +0100)]
Merge commit '014b6b416fec89777cb9cff61bcf7896eaf7cf39'

* commit '014b6b416fec89777cb9cff61bcf7896eaf7cf39':
  vp8: improve memory allocation checks

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

4 years agortmppkt: Repeat the full 32 bit timestamp for chunking continuation packets
Martin Storsjö [Wed, 14 Jan 2015 21:09:06 +0000 (23:09 +0200)]
rtmppkt: Repeat the full 32 bit timestamp for chunking continuation packets

This fixes sending chunked packets (packets larger than the output
chunk size, which often can be e.g. 4096 bytes) with a timestamp delta
(or absolute timstamp, if it's a timestamp step backwards, or the
first packet of the stream) larger than 0xffffffff.

The RTMP spec explicitly says (in section 5.3.1.3.) that packets of
type 3 (continuation packets) should include this field, if the
previous non-continuation packet had it included.

The receiving code handles these packets correctly.

Pointed out by Cheolho Park.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoh264_cabac: Break infinite loops
Michael Niedermayer [Thu, 31 Jan 2013 03:20:24 +0000 (04:20 +0100)]
h264_cabac: Break infinite loops

This fixes out of array reads and/or infinite loops.

30 is the maximum number of bits that can be read into
coeff_abs below.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Martin Storsjö <martin@martin.st>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 years agoopus_parser: drop unused variable
Vittorio Giovara [Wed, 14 Jan 2015 16:46:07 +0000 (17:46 +0100)]
opus_parser: drop unused variable

4 years agobsf: check memory allocations
Vittorio Giovara [Thu, 18 Dec 2014 19:26:56 +0000 (20:26 +0100)]
bsf: check memory allocations

4 years agovp8: improve memory allocation checks
Vittorio Giovara [Wed, 17 Dec 2014 15:02:08 +0000 (16:02 +0100)]
vp8: improve memory allocation checks

Check memory earlier, check one more allocation and clean up on error.

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

4 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>
4 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>
4 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.

4 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.

4 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.

4 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>
4 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>
4 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

4 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>
4 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>
4 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>
4 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.

4 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
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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

4 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>
4 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

4 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>
4 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>