ffmpeg.git
5 years agohevc: fix PPS_A_qualcomm_7(cherry picked from commit 2af177a8761c88eb477a658eebcf4264...
Mickaël Raulet [Sat, 19 Oct 2013 15:03:59 +0000 (17:03 +0200)]
hevc: fix PPS_A_qualcomm_7(cherry picked from commit 2af177a8761c88eb477a658eebcf4264068aa773)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/wavpackenc: fix uninitialized ret
Michael Niedermayer [Sat, 19 Oct 2013 23:58:51 +0000 (01:58 +0200)]
avcodec/wavpackenc: fix uninitialized ret

Fixes CID1108609

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tiff: remove byte based bpp special case
Michael Niedermayer [Sat, 19 Oct 2013 23:50:34 +0000 (01:50 +0200)]
avcodec/tiff: remove byte based bpp special case

This case does not work as off is uninitialized and it should be
handled fine by the generic code below

Fixes CID1108608

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc_refs: fix h/vshift calculation in ff_hevc_output_frame()
Michael Niedermayer [Sat, 19 Oct 2013 22:41:00 +0000 (00:41 +0200)]
avcodec/hevc_refs: fix h/vshift calculation in ff_hevc_output_frame()

Fixes CID1108577

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: do not dereference pointer before null check in verify_md5()
Michael Niedermayer [Sat, 19 Oct 2013 22:35:18 +0000 (00:35 +0200)]
avcodec/hevc: do not dereference pointer before null check in verify_md5()

Fixes: CID1108607

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc_cabac: trivial simplifications
Michael Niedermayer [Sat, 19 Oct 2013 22:33:29 +0000 (00:33 +0200)]
avcodec/hevc_cabac: trivial simplifications

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: inline cabac in hls_mvd_coding(cherry picked from commit ad387195ad04e8a005a1bf...
Mickaël Raulet [Fri, 18 Oct 2013 18:01:29 +0000 (20:01 +0200)]
hevc: inline cabac in hls_mvd_coding(cherry picked from commit ad387195ad04e8a005a1bfd509e9e4f827e68fa9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: inline cabac in residual coding(cherry picked from commit 17d7a880445b72feb36d6...
Mickaël Raulet [Fri, 18 Oct 2013 14:16:48 +0000 (16:16 +0200)]
hevc: inline cabac in residual coding(cherry picked from commit 17d7a880445b72feb36d684ae1f0597195811e97)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: fix EOB/EOS check
Michael Niedermayer [Sat, 19 Oct 2013 22:23:48 +0000 (00:23 +0200)]
avcodec/hevc: fix EOB/EOS check

Fixes: CID1108575
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264_parser: fix order of operations
Michael Niedermayer [Sat, 19 Oct 2013 21:44:34 +0000 (23:44 +0200)]
avcodec/h264_parser: fix order of operations

Fixes CID1108576

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffv1enc: use 64bit in maxsize calculation
Michael Niedermayer [Sat, 19 Oct 2013 21:36:35 +0000 (23:36 +0200)]
ffv1enc: use 64bit in maxsize calculation

This isnt needed but it cant hurt, its also more consistent with
how its calculated a few lines before.

See: CID1108593
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/exr: fix null pointer dereference
Michael Niedermayer [Sat, 19 Oct 2013 21:28:08 +0000 (23:28 +0200)]
avcodec/exr: fix null pointer dereference

Fixes CID1108582

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/exr: favor av_freep() over av_free() for saftey
Michael Niedermayer [Sat, 19 Oct 2013 21:27:36 +0000 (23:27 +0200)]
avcodec/exr: favor av_freep() over av_free() for saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/oggdec: favor av_freep() over av_free()
Michael Niedermayer [Sat, 19 Oct 2013 20:50:16 +0000 (22:50 +0200)]
avformat/oggdec: favor av_freep() over av_free()

Found-by: Reimar Döffinger
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: add some saftey checks to add_metadata_from_side_data()
Michael Niedermayer [Sat, 19 Oct 2013 15:52:47 +0000 (17:52 +0200)]
avcodec/utils: add some saftey checks to add_metadata_from_side_data()

This fixes potential overreads with crafted files.

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/avpacket/av_packet_split_side_data: ensure that side data padding is initialized
Michael Niedermayer [Sat, 19 Oct 2013 15:45:54 +0000 (17:45 +0200)]
avcodec/avpacket/av_packet_split_side_data: ensure that side data padding is initialized

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoDo not leave positive values undefined when negative are defined as error
Michael Niedermayer [Sun, 15 Sep 2013 13:25:09 +0000 (15:25 +0200)]
Do not leave positive values undefined when negative are defined as error

Define positive return values as non errors and leave further meaning undefined
This allows future extensions to use these values

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/developer: Add a policy item about updating the MAINTAINERs file
Michael Niedermayer [Fri, 11 Oct 2013 21:02:46 +0000 (23:02 +0200)]
doc/developer: Add a policy item about updating the MAINTAINERs file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/wtvdec: drop SHIFT_SECTOR_BITS() macro
Michael Niedermayer [Sat, 19 Oct 2013 09:15:07 +0000 (11:15 +0200)]
avformat/wtvdec: drop SHIFT_SECTOR_BITS() macro

it just wraps around a bitwise shift, and makes the code harder to read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 19 Oct 2013 09:01:59 +0000 (11:01 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wtv: Seek by sector properly

Conflicts:
libavformat/wtvdec.c

See: a0d13d84a928110b0e99ea16d17fd758fcbde35f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/wtv: rename to wtv_common
Michael Niedermayer [Sat, 19 Oct 2013 08:58:17 +0000 (10:58 +0200)]
avformat/wtv: rename to wtv_common

This helps git matchup files on merges correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: add Timothy to documentation
Michael Niedermayer [Fri, 18 Oct 2013 22:49:54 +0000 (00:49 +0200)]
MAINTAINERS: add Timothy to documentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: remove \r from cc_ident,
俞晓磊 [Fri, 18 Oct 2013 22:07:31 +0000 (00:07 +0200)]
configure: remove \r from cc_ident,

This should fix cygwin + non-cygwin toolchain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/pulse_audio_enc: fix error check
Lukasz Marek [Fri, 18 Oct 2013 21:41:19 +0000 (23:41 +0200)]
lavd/pulse_audio_enc: fix error check

Error check should be done by checking negative value, not non-zero.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agolavd/fbdev: use av_str2err() macro for printing error messages
Stefano Sabatini [Fri, 18 Oct 2013 21:38:54 +0000 (23:38 +0200)]
lavd/fbdev: use av_str2err() macro for printing error messages

In particular fix wrong strerror(ret) with a negative value, and avoid
the use of non thread-safe strerror().

5 years agolavd/pulse_audio_dec: apply cosmetic changes
Lukasz Marek [Fri, 18 Oct 2013 20:12:15 +0000 (22:12 +0200)]
lavd/pulse_audio_dec: apply cosmetic changes

In particular, fix punctuation in docs and make option help messages
grammatically consistent.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agolavd/fbdev: pass proper memory map length
Lukasz Marek [Fri, 18 Oct 2013 18:45:13 +0000 (20:45 +0200)]
lavd/fbdev: pass proper memory map length

fbdev->data was allocated with size fbdev->fixinfo.smem_len, release data
in fbdev_read_close() using the same size.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agoMAINTAINERS: add my name to a few entries
Stefano Sabatini [Fri, 18 Oct 2013 11:06:17 +0000 (13:06 +0200)]
MAINTAINERS: add my name to a few entries

5 years agoFix decoding of G.726 in AIFF.
Carl Eugen Hoyos [Fri, 18 Oct 2013 17:53:47 +0000 (19:53 +0200)]
Fix decoding of G.726 in AIFF.

Fixes ticket #1973.

5 years agolavf/riff: Fix a comment.
Carl Eugen Hoyos [Fri, 18 Oct 2013 17:35:03 +0000 (19:35 +0200)]
lavf/riff: Fix a comment.

FourCC aivx refers to (Sony) XAVC, not (Panasonic) AVC-Intra.
Spotted by Kieran Kunhya and Vincent Olivier.

5 years agoavformat: Use G726LE decoder for Sun AU files
Carl Eugen Hoyos [Thu, 11 Jul 2013 12:06:20 +0000 (14:06 +0200)]
avformat: Use G726LE decoder for Sun AU files

fixes ticket #1955 as suggested by Roman.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: Add little-endian G726 decoder
Carl Eugen Hoyos [Thu, 11 Jul 2013 12:06:20 +0000 (14:06 +0200)]
avcodec: Add little-endian G726 decoder

Fixes part of Ticket1955
suggested by Roman.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoSupport 4k AVC-Intra in mov.
Carl Eugen Hoyos [Fri, 18 Oct 2013 05:50:50 +0000 (07:50 +0200)]
Support 4k AVC-Intra in mov.

5 years agowtv: Seek by sector properly
Luca Barbato [Fri, 18 Oct 2013 11:45:13 +0000 (13:45 +0200)]
wtv: Seek by sector properly

Use an helper function to seek by sector to avoid possible mistakes
due shifting by WTV_SECTOR_BITS a 32bit integer.

Contrary to common intuition, a 32 bit integer left shifted
by a 64 bit integer does not promote the 32 bit integer to
64 bit before shifting.

5 years agoavformat/flvdec: use avpriv_request_sample()
Paul B Mahol [Fri, 18 Oct 2013 09:55:16 +0000 (09:55 +0000)]
avformat/flvdec: use avpriv_request_sample()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/hevcpred: fix make checkheaders.
Clément Bœsch [Thu, 17 Oct 2013 19:25:14 +0000 (21:25 +0200)]
avcodec/hevcpred: fix make checkheaders.

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 17 Oct 2013 18:15:18 +0000 (20:15 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Increase the tolerance in the lavr tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92'
Michael Niedermayer [Thu, 17 Oct 2013 17:50:19 +0000 (19:50 +0200)]
Merge commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92'

* commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92':
  fate: aac: Add test for AAC-LD

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolswr/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUT
Stefano Sabatini [Mon, 14 Oct 2013 23:20:35 +0000 (01:20 +0200)]
lswr/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUT

Improve interface flexibility. In particular makes it possible to set
channel layout through symbolic names using the av_opt_set() interface.

5 years agofate: Increase the tolerance in the lavr tests
Martin Storsjö [Thu, 17 Oct 2013 08:38:58 +0000 (11:38 +0300)]
fate: Increase the tolerance in the lavr tests

A few fate instances on OS/2, OpenBSD, FreeBSD and IA64 linux currently
still fail a few tests with a maxdiff of 6.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolavu/opt: add AV_OPT_TYPE_CHANNEL_LAYOUT and handler functions
Stefano Sabatini [Fri, 4 Oct 2013 10:07:55 +0000 (12:07 +0200)]
lavu/opt: add AV_OPT_TYPE_CHANNEL_LAYOUT and handler functions

The new type is compatible with AV_OPT_TYPE_INT64, but allows to specify
channel layouts using the format accepted by av_get_channel_layout().

5 years agolavu/channel_layout: change av_get_channel_layout() behavior at the next bump
Stefano Sabatini [Fri, 4 Oct 2013 13:20:50 +0000 (15:20 +0200)]
lavu/channel_layout: change av_get_channel_layout() behavior at the next bump

The new syntax is preferred since it allows backward syntax compatibility
with libswr when switching to the new option handling code with
AV_OPT_TYPE_CHANNEL_LAYOUT.

With the new parser the string:
1234

is interpreted as a channel layout mask, rather than as a number of
channels, and thus it's compatible with the current way to set a channel
layout as an integer (e.g. for the icl and ocl options) making use of
integer option values.

ff_get_channel_layout() with compat=0 will be used in the
AV_OPT_TYPE_CHANNEL handler code.

The user is encouraged to switch to the new forward compatible syntax,
which requires to put a trailing "c" when specifying a layout as a number
of channels.

5 years agolavu/opt.h: fix grammar typo in av_opt_get* doxy
Stefano Sabatini [Thu, 17 Oct 2013 15:08:11 +0000 (17:08 +0200)]
lavu/opt.h: fix grammar typo in av_opt_get* doxy

5 years agolavu/opt-test: use automatic set and free handlers
Stefano Sabatini [Thu, 17 Oct 2013 14:52:02 +0000 (16:52 +0200)]
lavu/opt-test: use automatic set and free handlers

In particular, do not set default string value by hand and use
av_opt_free() to free context.

5 years agoswscale/yuv2rgb: clip cy, avoid division by 0 with 0 contrast
Michael Niedermayer [Thu, 17 Oct 2013 11:39:28 +0000 (13:39 +0200)]
swscale/yuv2rgb: clip cy, avoid division by 0 with 0 contrast

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/utils/sws_setColorspaceDetails(): fix indention
Michael Niedermayer [Thu, 17 Oct 2013 09:18:04 +0000 (11:18 +0200)]
swscale/utils/sws_setColorspaceDetails(): fix indention

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: aac: Add test for AAC-LD
Diego Biurrun [Mon, 14 Oct 2013 21:40:05 +0000 (23:40 +0200)]
fate: aac: Add test for AAC-LD

5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 17 Oct 2013 08:42:36 +0000 (10:42 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add some necessary casts in the wtv demuxer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hevcdec: add more irap cases to hevc_probe()
Dirk Farin [Thu, 17 Oct 2013 08:14:51 +0000 (10:14 +0200)]
avformat/hevcdec: add more irap cases to hevc_probe()

This fixes fate-hevc-conformance-RAP_A_docomo_4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hevcdec: cosmetics, whitespaces
Dirk Farin [Sat, 12 Oct 2013 09:55:44 +0000 (11:55 +0200)]
avformat/hevcdec: cosmetics, whitespaces

This reduces the difference to the latest hevc demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdd some necessary casts in the wtv demuxer.
Carl Eugen Hoyos [Thu, 17 Oct 2013 07:51:06 +0000 (09:51 +0200)]
Add some necessary casts in the wtv demuxer.

This reverts e8023dba, fixes ticket #3049.

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 17 Oct 2013 06:13:12 +0000 (08:13 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mem: Make av_strdup allocate using av_realloc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: fix pcm with different chroma luma bit widths(cherry picked from commit 6a44451...
Mickaël Raulet [Wed, 16 Oct 2013 14:03:57 +0000 (16:03 +0200)]
hevc: fix pcm with different chroma luma bit widths(cherry picked from commit 6a444516f338424d062c0ef2806714036283603b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: optimize residual coding(cherry picked from commit 70692a44708157b4dfa50e402e44...
Mickaël Raulet [Fri, 11 Oct 2013 20:07:00 +0000 (22:07 +0200)]
hevc: optimize residual coding(cherry picked from commit 70692a44708157b4dfa50e402e446bfa2b27f55e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/log: fix race between setting and using the log callback
Michael Niedermayer [Wed, 16 Oct 2013 22:48:43 +0000 (00:48 +0200)]
avutil/log: fix race between setting and using the log callback

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/utils: fix docs build
Michael Niedermayer [Wed, 16 Oct 2013 20:25:08 +0000 (22:25 +0200)]
doc/utils: fix docs build

Not sure this is the correct solution but that can be investigated too once
the docs build again

Tested-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswsscale/swscale_unscaled: add GBRAP16
Paul B Mahol [Mon, 14 Oct 2013 17:42:41 +0000 (17:42 +0000)]
swsscale/swscale_unscaled: add GBRAP16

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/swscale_unscaled: fix alpha pointer & stride for planarRgb16ToRgb16Wrapper()
Michael Niedermayer [Wed, 16 Oct 2013 18:37:09 +0000 (20:37 +0200)]
swscale/swscale_unscaled: fix alpha pointer & stride for planarRgb16ToRgb16Wrapper()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/filters: reference ffmpeg-utils manual for color and sizes options
Timothy Gu [Mon, 14 Oct 2013 01:37:12 +0000 (18:37 -0700)]
doc/filters: reference ffmpeg-utils manual for color and sizes options

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agodoc/utils: reformat doc for color syntax and add list of supported colors
Timothy Gu [Mon, 14 Oct 2013 01:37:11 +0000 (18:37 -0700)]
doc/utils: reformat doc for color syntax and add list of supported colors

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agodoc/utils: rewrite doc for time duration syntax
Timothy Gu [Wed, 4 Sep 2013 00:19:26 +0000 (17:19 -0700)]
doc/utils: rewrite doc for time duration syntax

Extend description and clarify syntax.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agomem: Make av_strdup allocate using av_realloc
Martin Storsjö [Fri, 4 Oct 2013 21:19:13 +0000 (00:19 +0300)]
mem: Make av_strdup allocate using av_realloc

This makes sure that pointers from av_strdup are reallocable,
which is used in av_dict_set if the AV_DICT_APPEND flag is set.

Nothing should rely on pointers from av_strdup being aligned.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoSupport HEVC in transport streams.
Carl Eugen Hoyos [Wed, 16 Oct 2013 02:12:27 +0000 (04:12 +0200)]
Support HEVC in transport streams.

5 years agoavcodec/vp9: fix band_counts array size / padding
Ronald S. Bultje [Wed, 16 Oct 2013 15:11:17 +0000 (17:11 +0200)]
avcodec/vp9: fix band_counts array size / padding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/exr: piz decompression
Paul B Mahol [Wed, 27 Feb 2013 19:29:39 +0000 (19:29 +0000)]
avcodec/exr: piz decompression

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 16 Oct 2013 13:08:10 +0000 (15:08 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: Move 8x8 in a separate function

Conflicts:
libavcodec/mpegvideo_motion.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '95587859cc69e5abe37c9e3af48008032d98e262' into HEAD
Michael Niedermayer [Wed, 16 Oct 2013 12:51:00 +0000 (14:51 +0200)]
Merge commit '95587859cc69e5abe37c9e3af48008032d98e262' into HEAD

* commit '95587859cc69e5abe37c9e3af48008032d98e262':
  mpegvideo: Move obmc in a separate function

Conflicts:
libavcodec/mpegvideo_motion.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886'
Michael Niedermayer [Wed, 16 Oct 2013 12:02:43 +0000 (14:02 +0200)]
Merge commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886'

* commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886':
  ffv1: Assume bitdepth 0 means 8bit

Conflicts:
libavcodec/ffv1dec.c

Note, FFmpeg is not affected by this bug

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860'
Michael Niedermayer [Wed, 16 Oct 2013 11:54:41 +0000 (13:54 +0200)]
Merge commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860'

* commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860':
  mpegvideo: K&R formatting cosmetics

Conflicts:
libavcodec/mpegvideo_motion.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '93f305473f880729d18b5e42067f19d2106cb2e5'
Michael Niedermayer [Wed, 16 Oct 2013 11:08:37 +0000 (13:08 +0200)]
Merge commit '93f305473f880729d18b5e42067f19d2106cb2e5'

* commit '93f305473f880729d18b5e42067f19d2106cb2e5':
  lavc: Convert some remaining strides to ptrdiff_t

Conflicts:
libavcodec/h264.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/vp56.c
libavcodec/wmv2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208'
Michael Niedermayer [Wed, 16 Oct 2013 10:51:26 +0000 (12:51 +0200)]
Merge commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208'

* commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208':
  h264_parser: Fix POC parsing for the case where MMCO_RESET is present.

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9'
Michael Niedermayer [Wed, 16 Oct 2013 10:38:55 +0000 (12:38 +0200)]
Merge commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9'

* commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9':
  h264_parser: Fix POC parsing for the case where MMCO_RESET is absent.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6b081eff4dfc3c899960f69f30cb567266b7dca3'
Michael Niedermayer [Wed, 16 Oct 2013 10:22:40 +0000 (12:22 +0200)]
Merge commit '6b081eff4dfc3c899960f69f30cb567266b7dca3'

* commit '6b081eff4dfc3c899960f69f30cb567266b7dca3':
  fate: add vorbiscomment cover art test

Conflicts:
tests/fate/cover-art.mak

See: 1ca3902726fb8c1398ab00d146ebe3e2f31b76e6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '68edd5be0980941924ae633d98589d56a8091bbd'
Michael Niedermayer [Wed, 16 Oct 2013 10:12:13 +0000 (12:12 +0200)]
Merge commit '68edd5be0980941924ae633d98589d56a8091bbd'

* commit '68edd5be0980941924ae633d98589d56a8091bbd':
  FATE: use proper comparison mode in the lavr tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf'
Michael Niedermayer [Wed, 16 Oct 2013 10:02:38 +0000 (12:02 +0200)]
Merge commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf'

* commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf':
  tiny_psnr: switch f32 handling to floating point

Conflicts:
tests/tiny_psnr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55'
Michael Niedermayer [Wed, 16 Oct 2013 09:30:17 +0000 (11:30 +0200)]
Merge commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55'

* commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55':
  bitstream: Check the result of av_malloc()

Conflicts:
libavcodec/bitstream.c

See: aa74810fc6b9afe21c9be3725e3d078d10633670
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8'
Michael Niedermayer [Wed, 16 Oct 2013 09:05:02 +0000 (11:05 +0200)]
Merge commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8'

* commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8':
  cavs: more K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c0085f94fea89b180e5727b193484a83586d3490'
Michael Niedermayer [Wed, 16 Oct 2013 08:55:32 +0000 (10:55 +0200)]
Merge commit 'c0085f94fea89b180e5727b193484a83586d3490'

* commit 'c0085f94fea89b180e5727b193484a83586d3490':
  mpegaudio_tablegen: Don't use llrint
  cos_tablegen: Don't use lrint
  tablegen: Don't use cbrtf in host tools
  tableprint: Fix use of a size_t print with MSVC

Conflicts:
libavcodec/cbrt_tablegen.h
libavcodec/mpegaudio_tablegen.h

See: e51692114354b8e460bf5c9f6def7089a6b969c0
See: 50867209930fd03c05b879bd6223b52c7305c90a
See: 008014b5e72442fe7c8bf4a31e6bb74469b81359
See: 00aa24ffee91d52488765088ea0f60748e2a2083
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: fixing TSCL_A_VIDYO_5 decoding output order(cherry picked from commit 19c5d9ed2...
Mickaël Raulet [Tue, 15 Oct 2013 21:04:25 +0000 (23:04 +0200)]
hevc: fixing TSCL_A_VIDYO_5 decoding output order(cherry picked from commit 19c5d9ed28606e7a166d180fc9f1517cb174146f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: fix DBLK_A_MAIN10_VIXS_2 on big endian
Michael Niedermayer [Tue, 15 Oct 2013 23:26:50 +0000 (01:26 +0200)]
fate: fix DBLK_A_MAIN10_VIXS_2 on big endian

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFATE: add HEVC tests
Guillaume Martres [Sat, 12 Oct 2013 09:55:47 +0000 (11:55 +0200)]
FATE: add HEVC tests

The tests are disabled as 2 do not pass yet
(fate-hevc-conformance-PPS_A_qualcomm_7 and fate-hevc-conformance-RAP_A_docomo_4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: fix "correctly" typo
Michael Niedermayer [Tue, 15 Oct 2013 22:26:10 +0000 (00:26 +0200)]
avformat/mov: fix "correctly" typo

Found-by: Timothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/matroskadec: Support HEVC demuxing.
Yusuke Nakamura [Sat, 12 Oct 2013 09:55:46 +0000 (11:55 +0200)]
lavf/matroskadec: Support HEVC demuxing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/mov: Support HEVC demuxing.
Yusuke Nakamura [Sat, 12 Oct 2013 09:55:45 +0000 (11:55 +0200)]
lavf/mov: Support HEVC demuxing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovalgrind cleanup(cherry picked from commit 0d5efa40b94c0de92a1fe5091b21e0e2d36bae3d)
gcocherel [Tue, 15 Oct 2013 14:47:52 +0000 (16:47 +0200)]
valgrind cleanup(cherry picked from commit 0d5efa40b94c0de92a1fe5091b21e0e2d36bae3d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegvideo: Move 8x8 in a separate function
Luca Barbato [Sun, 13 Oct 2013 05:55:14 +0000 (07:55 +0200)]
mpegvideo: Move 8x8 in a separate function

5 years agompegvideo: Move obmc in a separate function
Luca Barbato [Sun, 13 Oct 2013 05:27:11 +0000 (07:27 +0200)]
mpegvideo: Move obmc in a separate function

5 years agoffv1: Assume bitdepth 0 means 8bit
Luca Barbato [Sun, 13 Oct 2013 13:34:47 +0000 (15:34 +0200)]
ffv1: Assume bitdepth 0 means 8bit

CC: libav-stable@libav.org
Reported-by: debian/726189
5 years agompegvideo: K&R formatting cosmetics
Luca Barbato [Sun, 13 Oct 2013 05:13:01 +0000 (07:13 +0200)]
mpegvideo: K&R formatting cosmetics

5 years agolavc: Convert some remaining strides to ptrdiff_t
Ronald S. Bultje [Sun, 13 Oct 2013 00:42:42 +0000 (02:42 +0200)]
lavc: Convert some remaining strides to ptrdiff_t

5 years agohevc: add ts demux support
Mickaël Raulet [Fri, 11 Oct 2013 19:43:58 +0000 (21:43 +0200)]
hevc: add ts demux support

cherry picked from commit 925ee44364a7bce58e2ac5bac91077ce0a75d883

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/hevc: mark decoder as experimental
Michael Niedermayer [Sat, 12 Oct 2013 13:09:08 +0000 (15:09 +0200)]
lavc/hevc: mark decoder as experimental

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/hevc_ps: fix PIX_FMT enums
Michael Niedermayer [Sat, 12 Oct 2013 13:00:38 +0000 (15:00 +0200)]
lavc/hevc_ps: fix PIX_FMT enums

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc: add a HEVC decoder.
Guillaume Martres [Sat, 12 Oct 2013 09:55:48 +0000 (11:55 +0200)]
lavc: add a HEVC decoder.

Initially written by Guillaume Martres <smarter@ubuntu.com> as a GSoC
project. Further contributions by the OpenHEVC project and other
developers, namely:

Mickaël Raulet <mraulet@insa-rennes.fr>
Seppo Tomperi <seppo.tomperi@vtt.fi>
Gildas Cocherel <gildas.cocherel@laposte.net>
Khaled Jerbi <khaled_jerbi@yahoo.fr>
Wassim Hamidouche <wassim.hamidouche@insa-rennes.fr>
Vittorio Giovara <vittorio.giovara@gmail.com>
Jan Ekström <jeebjp@gmail.com>
Anton Khirnov <anton@khirnov.net>
Martin Storsjö <martin@martin.st>
Luca Barbato <lu_zero@gentoo.org>
Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegaudio_tablegen: remove dead branch
Michael Niedermayer [Tue, 15 Oct 2013 19:43:32 +0000 (21:43 +0200)]
avcodec/mpegaudio_tablegen: remove dead branch

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: rename a few more h.265 to HEVC
Michael Niedermayer [Tue, 15 Oct 2013 19:18:48 +0000 (21:18 +0200)]
avformat: rename a few more h.265 to HEVC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: improve precission for cbrtf() emulation
Michael Niedermayer [Tue, 15 Oct 2013 18:06:44 +0000 (20:06 +0200)]
avcodec: improve precission for cbrtf() emulation

cbrtf() took floats but it represented 1/3 exactly
and even if not more precission should be better in theory
for the table generation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264_parser: Fix POC parsing for the case where MMCO_RESET is present.
Yusuke Nakamura [Tue, 24 Sep 2013 09:30:50 +0000 (18:30 +0900)]
h264_parser: Fix POC parsing for the case where MMCO_RESET is present.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoh264_parser: Fix POC parsing for the case where MMCO_RESET is absent.
Yusuke Nakamura [Mon, 16 Sep 2013 09:34:27 +0000 (18:34 +0900)]
h264_parser: Fix POC parsing for the case where MMCO_RESET is absent.

The prev_ values were not set after parsing POC.
Increase length of the buffer decoded to parse enough safely.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agofate: add vorbiscomment cover art test
James Almer [Fri, 26 Jul 2013 05:56:19 +0000 (02:56 -0300)]
fate: add vorbiscomment cover art test

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>