ffmpeg.git
6 years agoAdd libx265 encoder
Derek Buitenhuis [Wed, 2 Oct 2013 14:46:26 +0000 (14:46 +0000)]
Add libx265 encoder

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoavfilter/lut3d: inline whole loop in interpolation function.
Clément Bœsch [Wed, 12 Feb 2014 09:12:46 +0000 (10:12 +0100)]
avfilter/lut3d: inline whole loop in interpolation function.

84 → 92 fps here.

6 years agoavformat/mov: fix keyframe flags for sample from chromium Issue 340865
Michael Niedermayer [Wed, 12 Feb 2014 05:32:51 +0000 (06:32 +0100)]
avformat/mov: fix keyframe flags for sample from chromium Issue 340865

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Tue, 11 Feb 2014 23:37:51 +0000 (00:37 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavf/lavd: version bump and APIchanges for uncoded frames.
  tools: add uncoded_frame test program.
  lavf: add uncodedframecrc test muxer.
  lavd/xv: preliminary support of uncoded frame.
  lavd/alsa: preliminary support of uncoded frame.
  lavf: add write_uncoded_frame() API.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpegaudio_parser: Delay setting codec_id if it appears wrong
Michael Niedermayer [Tue, 11 Feb 2014 23:11:16 +0000 (00:11 +0100)]
avcodec/mpegaudio_parser: Delay setting codec_id if it appears wrong

Fixes mp1/mp3 in mp4 misdetection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpegaudio_parser: treat codec_id like the other parameters
Michael Niedermayer [Tue, 11 Feb 2014 22:58:39 +0000 (23:58 +0100)]
avcodec/mpegaudio_parser: treat codec_id like the other parameters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: Add avpriv_mpa_decode_header2()
Michael Niedermayer [Tue, 11 Feb 2014 22:57:47 +0000 (23:57 +0100)]
avcodec: Add avpriv_mpa_decode_header2()

The difference to avpriv_mpa_decode_header() is that it doesnt need or modify the context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 11 Feb 2014 22:20:09 +0000 (23:20 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: set AVFrame pkt_pts and reordered_opaque in reget_buffer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6477449243db4aab15a4db356e8354c60b5366ec'
Michael Niedermayer [Tue, 11 Feb 2014 22:04:15 +0000 (23:04 +0100)]
Merge commit '6477449243db4aab15a4db356e8354c60b5366ec'

* commit '6477449243db4aab15a4db356e8354c60b5366ec':
  g2meet: make JPEG tile decoder operate on 8x8 block mask

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd6d78518018a12fb495baab5663708a830f3aab6'
Michael Niedermayer [Tue, 11 Feb 2014 21:37:35 +0000 (22:37 +0100)]
Merge commit 'd6d78518018a12fb495baab5663708a830f3aab6'

* commit 'd6d78518018a12fb495baab5663708a830f3aab6':
  g2meet: factor out seeking to the chunk end

Conflicts:
libavcodec/g2meet.c

See: 3f826039ddccdd7840cdf982a1a61cb11121a5a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: set AVFrame pkt_pts and reordered_opaque in reget_buffer
John Stebbins [Mon, 10 Feb 2014 15:53:20 +0000 (08:53 -0700)]
lavc: set AVFrame pkt_pts and reordered_opaque in reget_buffer

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agog2meet: make JPEG tile decoder operate on 8x8 block mask
Kostya Shishkov [Sat, 8 Feb 2014 12:39:32 +0000 (13:39 +0100)]
g2meet: make JPEG tile decoder operate on 8x8 block mask

This is needed for upcoming Go2Meeting (G2M2/G2M3) decoder.

6 years agog2meet: factor out seeking to the chunk end
Maxim Poliakovski [Mon, 21 Oct 2013 22:54:51 +0000 (00:54 +0200)]
g2meet: factor out seeking to the chunk end

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
6 years agolavf/lavd: version bump and APIchanges for uncoded frames.
Nicolas George [Tue, 11 Feb 2014 09:34:32 +0000 (10:34 +0100)]
lavf/lavd: version bump and APIchanges for uncoded frames.

6 years agotools: add uncoded_frame test program.
Nicolas George [Mon, 3 Feb 2014 08:12:27 +0000 (09:12 +0100)]
tools: add uncoded_frame test program.

6 years agolavf: add uncodedframecrc test muxer.
Nicolas George [Wed, 15 Jan 2014 22:08:43 +0000 (23:08 +0100)]
lavf: add uncodedframecrc test muxer.

6 years agolavd/xv: preliminary support of uncoded frame.
Nicolas George [Wed, 1 Jan 2014 11:05:48 +0000 (12:05 +0100)]
lavd/xv: preliminary support of uncoded frame.

6 years agolavd/alsa: preliminary support of uncoded frame.
Nicolas George [Tue, 31 Dec 2013 13:09:15 +0000 (14:09 +0100)]
lavd/alsa: preliminary support of uncoded frame.

6 years agolavf: add write_uncoded_frame() API.
Nicolas George [Tue, 31 Dec 2013 13:09:48 +0000 (14:09 +0100)]
lavf: add write_uncoded_frame() API.

6 years agox86: add missing XOP checks and macros
James Almer [Thu, 6 Feb 2014 04:33:59 +0000 (01:33 -0300)]
x86: add missing XOP checks and macros

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/frei0r: load plugins from lib64 folders as well on 64bit builds
Marton Balint [Wed, 5 Feb 2014 00:24:19 +0000 (01:24 +0100)]
lavfi/frei0r: load plugins from lib64 folders as well on 64bit builds

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/libssh: Fix libssh defaulting to shared linkage.
Matt Oliver [Tue, 4 Feb 2014 23:43:38 +0000 (10:43 +1100)]
avformat/libssh: Fix libssh defaulting to shared linkage.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com>
See: [FFmpeg-devel] Fix libssh static linkage on Windows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ra144: remove redundant AV_ZERO128
Michael Niedermayer [Mon, 10 Feb 2014 20:52:45 +0000 (21:52 +0100)]
avcodec/ra144: remove redundant AV_ZERO128

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agora144: use scalarproduct_int16
Christophe Gisquet [Sun, 4 Mar 2012 12:28:16 +0000 (13:28 +0100)]
ra144: use scalarproduct_int16

The buffer holding the coefficients must be padded with 0 so as to use DSP
functions that may overread. Currently, the SSE2/3 versions is an example,
as they process batches of 16 bytes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 10 Feb 2014 20:02:35 +0000 (21:02 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rpza: limit the number of blocks to the total remaining blocks in the frame

See: 3819db745da2ac7fb3faacb116788c32f4753f34
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a46dc49744bdc4f2e31725b63ac8e41f701e4fa1'
Michael Niedermayer [Mon, 10 Feb 2014 19:45:40 +0000 (20:45 +0100)]
Merge commit 'a46dc49744bdc4f2e31725b63ac8e41f701e4fa1'

* commit 'a46dc49744bdc4f2e31725b63ac8e41f701e4fa1':
  rpza: move some variables to the blocks where they are used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c7769df178fd670156f1c11f6c8410ddd59bbfee'
Michael Niedermayer [Mon, 10 Feb 2014 19:40:31 +0000 (20:40 +0100)]
Merge commit 'c7769df178fd670156f1c11f6c8410ddd59bbfee'

* commit 'c7769df178fd670156f1c11f6c8410ddd59bbfee':
  rpza: use fixed-width int types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e1218ce9149aad0ae9770a32a78d77ad2210bd64'
Michael Niedermayer [Mon, 10 Feb 2014 19:31:56 +0000 (20:31 +0100)]
Merge commit 'e1218ce9149aad0ae9770a32a78d77ad2210bd64'

* commit 'e1218ce9149aad0ae9770a32a78d77ad2210bd64':
  rpza: switch to bytestream2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: fix vstats
Michael Niedermayer [Mon, 10 Feb 2014 19:23:12 +0000 (20:23 +0100)]
ffmpeg: fix vstats

Broken by: 394fb56c29eee7f4f8f0334d8b5d30d3c54ac703
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703'
Michael Niedermayer [Mon, 10 Feb 2014 18:57:23 +0000 (19:57 +0100)]
Merge commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703'

* commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703':
  lavf: always unref the packet passed to av_interleaved_write_frame() on error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/APIchanges: fill in FFmpeg hashes & versions
Michael Niedermayer [Mon, 10 Feb 2014 18:10:12 +0000 (19:10 +0100)]
doc/APIchanges: fill in FFmpeg hashes & versions

Entries that have no hash at all are not filled in

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/concatdec: pass the interrupt callback on
Zhang Rui [Sat, 8 Feb 2014 04:17:42 +0000 (12:17 +0800)]
avformat/concatdec: pass the interrupt callback on

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agorpza: limit the number of blocks to the total remaining blocks in the frame
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
rpza: limit the number of blocks to the total remaining blocks in the frame

Fixes invalid writes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

6 years agorpza: move some variables to the blocks where they are used
Anton Khirnov [Wed, 8 Jan 2014 13:03:23 +0000 (14:03 +0100)]
rpza: move some variables to the blocks where they are used

6 years agorpza: use fixed-width int types
Anton Khirnov [Wed, 8 Jan 2014 13:00:13 +0000 (14:00 +0100)]
rpza: use fixed-width int types

6 years agorpza: switch to bytestream2
Anton Khirnov [Wed, 8 Jan 2014 12:58:38 +0000 (13:58 +0100)]
rpza: switch to bytestream2

6 years agolavf: always unref the packet passed to av_interleaved_write_frame() on error
Anton Khirnov [Tue, 4 Feb 2014 14:58:11 +0000 (15:58 +0100)]
lavf: always unref the packet passed to av_interleaved_write_frame() on error

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 10 Feb 2014 13:20:43 +0000 (14:20 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: fix examples compilation when EXESUF is not empty

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '18c896be3d8e926ef806e7de29c4a168d7763389'
Michael Niedermayer [Mon, 10 Feb 2014 13:09:56 +0000 (14:09 +0100)]
Merge commit '18c896be3d8e926ef806e7de29c4a168d7763389'

* commit '18c896be3d8e926ef806e7de29c4a168d7763389':
  lavf: extend / improve the AVFormatContext doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '54f7e79d4706a8343dad1d8da51b7d3d3b2cd3b2'
Michael Niedermayer [Mon, 10 Feb 2014 12:52:19 +0000 (13:52 +0100)]
Merge commit '54f7e79d4706a8343dad1d8da51b7d3d3b2cd3b2'

* commit '54f7e79d4706a8343dad1d8da51b7d3d3b2cd3b2':
  lavf: add some basic documentation of the muxing process

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4c750599509c3973afbe2850953a1fb963f696e5'
Michael Niedermayer [Mon, 10 Feb 2014 12:47:01 +0000 (13:47 +0100)]
Merge commit '4c750599509c3973afbe2850953a1fb963f696e5'

* commit '4c750599509c3973afbe2850953a1fb963f696e5':
  lavf: rewrite the av_write_frame() doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ad7f2b69a546ec65ef6b11e1a0fd58e6bb66bc4b'
Michael Niedermayer [Mon, 10 Feb 2014 12:32:18 +0000 (13:32 +0100)]
Merge commit 'ad7f2b69a546ec65ef6b11e1a0fd58e6bb66bc4b'

* commit 'ad7f2b69a546ec65ef6b11e1a0fd58e6bb66bc4b':
  lavf: rewrite the av_interleaved_write_frame() doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d'
Michael Niedermayer [Mon, 10 Feb 2014 12:09:13 +0000 (13:09 +0100)]
Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d'

* commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d':
  avplay: add support for seeking to chapter marks

Conflicts:
doc/ffplay.texi
ffplay.c

ffplay uses pageup/down for seeking by +-10min
thus this use of the keys conflicts.
The merge thus uses them to seek to chapters when there are some or
+-10min when there are not

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: fix examples compilation when EXESUF is not empty
Christophe Gisquet [Sun, 9 Feb 2014 23:23:28 +0000 (00:23 +0100)]
build: fix examples compilation when EXESUF is not empty

Due to a wrong substitution doc/examples is not added as a prerequisite
for the objects of the example programs. This results in compiler error
due to the non-existing output directory.

Bug-Id: 636

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
6 years agolavf: allow av_find_best_stream to return AV_DISPOSITION_*_IMPAIRED wanted_streams
Marton Balint [Tue, 4 Feb 2014 22:59:47 +0000 (23:59 +0100)]
lavf: allow av_find_best_stream to return AV_DISPOSITION_*_IMPAIRED wanted_streams

Previously these type of streams were not returned even if wanted stream was
set to a stream of such. Now they are only skipped if they are not wanted
streams.

Fixes ffplay -sst <stream number> out.ts where stream number is a *_IMPAIRED stream.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f548f9f9e7a2a08c780e88dac63b9d5d2c55efb0'
Michael Niedermayer [Mon, 10 Feb 2014 11:53:31 +0000 (12:53 +0100)]
Merge commit 'f548f9f9e7a2a08c780e88dac63b9d5d2c55efb0'

* commit 'f548f9f9e7a2a08c780e88dac63b9d5d2c55efb0':
  hevc: update conformance streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f'
Michael Niedermayer [Mon, 10 Feb 2014 11:39:55 +0000 (12:39 +0100)]
Merge commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f'

* commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f':
  FATE: force FLAC in the lavf ogg test

Conflicts:
tests/lavf-regression.sh

See: 28caf13ac394df5424a25304bda4608441bd85ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '38893dc028e458eaf3f906833d4ee515689edb7e'
Michael Niedermayer [Mon, 10 Feb 2014 11:36:32 +0000 (12:36 +0100)]
Merge commit '38893dc028e458eaf3f906833d4ee515689edb7e'

* commit '38893dc028e458eaf3f906833d4ee515689edb7e':
  pcmdec: replace a reachable assert with an error check

Conflicts:
libavformat/pcmdec.c

No assert removed as there was none in FFmpeg in the equivalent function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d'
Michael Niedermayer [Mon, 10 Feb 2014 11:29:05 +0000 (12:29 +0100)]
Merge commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d'

* commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d':
  doc/APIchanges: mark the place where 9 was branched

Conflicts:
doc/APIchanges

Not merged, as "9" was not a FFmpeg release and not branched anywhere from our APIChanges list

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203'
Michael Niedermayer [Mon, 10 Feb 2014 11:17:35 +0000 (12:17 +0100)]
Merge commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203'

* commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203':
  doc/APIchanges: fill in missing hashes and dates

Conflicts:
doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: extend / improve the AVFormatContext doxy
Anton Khirnov [Tue, 4 Feb 2014 17:11:40 +0000 (18:11 +0100)]
lavf: extend / improve the AVFormatContext doxy

6 years agolavf: add some basic documentation of the muxing process
Anton Khirnov [Tue, 4 Feb 2014 16:35:18 +0000 (17:35 +0100)]
lavf: add some basic documentation of the muxing process

6 years agolavf: rewrite the av_write_frame() doxy
Anton Khirnov [Tue, 4 Feb 2014 14:46:51 +0000 (15:46 +0100)]
lavf: rewrite the av_write_frame() doxy

Remove some vague / incorrect statements and make the text more specific
and less confusing.

6 years agolavf: rewrite the av_interleaved_write_frame() doxy
Anton Khirnov [Tue, 4 Feb 2014 14:46:51 +0000 (15:46 +0100)]
lavf: rewrite the av_interleaved_write_frame() doxy

Remove some vague / incorrect statements and make the text more specific
and less confusing.

6 years agoavplay: add support for seeking to chapter marks
Anton Khirnov [Wed, 4 Sep 2013 18:30:28 +0000 (20:30 +0200)]
avplay: add support for seeking to chapter marks

6 years agohevc: update conformance streams
Guillaume Martres [Thu, 6 Feb 2014 22:37:06 +0000 (23:37 +0100)]
hevc: update conformance streams

New streams: LTRPSPS_A_Qualcomm_1, SLPPLP_A_VIDYO_1, VPSID_A_VIDYO_1
Updated streams: EXT_A_ericsson_4, NUT_A_ericsson_5, RPS_C_ericsson_5,
  RPS_D_ericsson_6

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoFATE: force FLAC in the lavf ogg test
Anton Khirnov [Mon, 10 Feb 2014 06:43:40 +0000 (07:43 +0100)]
FATE: force FLAC in the lavf ogg test

Since b0c2c09, vorbis would be used if libvorbis is compiled in.

6 years agopcmdec: replace a reachable assert with an error check
Anton Khirnov [Mon, 10 Feb 2014 06:41:21 +0000 (07:41 +0100)]
pcmdec: replace a reachable assert with an error check

Libavformat should not make any assumptions about values returned from
other libraries. This assert is easily reachable by using a non-raw
codec id.

6 years agodoc/APIchanges: mark the place where 9 was branched
Anton Khirnov [Thu, 6 Feb 2014 12:50:33 +0000 (13:50 +0100)]
doc/APIchanges: mark the place where 9 was branched

6 years agodoc/APIchanges: fill in missing hashes and dates
Anton Khirnov [Thu, 6 Feb 2014 12:48:26 +0000 (13:48 +0100)]
doc/APIchanges: fill in missing hashes and dates

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 10 Feb 2014 02:54:21 +0000 (03:54 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hevc: Conceal zero td

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e95018b694c0774477abec5bbf86ecc7946a9a28'
Michael Niedermayer [Mon, 10 Feb 2014 02:42:06 +0000 (03:42 +0100)]
Merge commit 'e95018b694c0774477abec5bbf86ecc7946a9a28'

* commit 'e95018b694c0774477abec5bbf86ecc7946a9a28':
  dnxhd: Support DNx444

Conflicts:
Changelog
libavcodec/dnxhddata.c
libavcodec/dnxhddec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2f6eec65acc953faed3951fb8f1eabed830fdd2f'
Michael Niedermayer [Mon, 10 Feb 2014 01:21:05 +0000 (02:21 +0100)]
Merge commit '2f6eec65acc953faed3951fb8f1eabed830fdd2f'

* commit '2f6eec65acc953faed3951fb8f1eabed830fdd2f':
  vp8: fix PPC assembly to work if src_stride != dst_stride

See: 34b429d5ba7b823748e897f0295aa78aaa2ebb9d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b37effdc52835e121a0e259e57273a19f9cd61a3'
Michael Niedermayer [Mon, 10 Feb 2014 00:07:52 +0000 (01:07 +0100)]
Merge commit 'b37effdc52835e121a0e259e57273a19f9cd61a3'

* commit 'b37effdc52835e121a0e259e57273a19f9cd61a3':
  mxfdec: free descriptor extradata in .read_close()

See: 9f92e590ba91faa1283b1a9a35dd7e43c5bd998b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6a8475dc4f10d65edb7faa8df6e035af0ddcce19'
Michael Niedermayer [Sun, 9 Feb 2014 21:03:59 +0000 (22:03 +0100)]
Merge commit '6a8475dc4f10d65edb7faa8df6e035af0ddcce19'

* commit '6a8475dc4f10d65edb7faa8df6e035af0ddcce19':
  asvenc: free avctx->coded_frame on codec close

Not merged as we do not allocate coded_frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e'
Michael Niedermayer [Sun, 9 Feb 2014 19:57:32 +0000 (20:57 +0100)]
Merge commit 'd6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e'

* commit 'd6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e':
  arm: Remove a stray .fpu directive

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '28e508a94677d5dffde009c5f8ca7d6a4d2ca8e8'
Michael Niedermayer [Sun, 9 Feb 2014 19:15:07 +0000 (20:15 +0100)]
Merge commit '28e508a94677d5dffde009c5f8ca7d6a4d2ca8e8'

* commit '28e508a94677d5dffde009c5f8ca7d6a4d2ca8e8':
  dnxhddec: return proper error code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: fix lavf-ogg test
Michael Niedermayer [Sun, 9 Feb 2014 19:10:02 +0000 (20:10 +0100)]
fate: fix lavf-ogg test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b0c2c097e422b9e10a7d856582f8321d28af821e'
Michael Niedermayer [Sun, 9 Feb 2014 19:03:56 +0000 (20:03 +0100)]
Merge commit 'b0c2c097e422b9e10a7d856582f8321d28af821e'

* commit 'b0c2c097e422b9e10a7d856582f8321d28af821e':
  lavf: default .ogg audio to libvorbis if we can

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'bc3f03567a04a9f7e412bcf2ca09c163f3f13941'
Michael Niedermayer [Sun, 9 Feb 2014 19:01:32 +0000 (20:01 +0100)]
Merge commit 'bc3f03567a04a9f7e412bcf2ca09c163f3f13941'

* commit 'bc3f03567a04a9f7e412bcf2ca09c163f3f13941':
  g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO

Conflicts:
libavcodec/g2meet.c

See: cb2162adba4041951c987f9f365957e067b28a97
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: Conceal zero td
Luca Barbato [Sat, 8 Feb 2014 05:10:27 +0000 (06:10 +0100)]
hevc: Conceal zero td

It was done only in check_mvset(), while mv_scale() is called also by
dist_scale().

Sample-Id: 00001579-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agodnxhd: Support DNx444
Kostya Shishkov [Mon, 27 Jan 2014 18:10:44 +0000 (18:10 +0000)]
dnxhd: Support DNx444

Bug-Id: 99
Bug-Id: videolan/9620
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoMerge commit '722554788b77c13748e83458f626a9ac38b70072'
Michael Niedermayer [Sun, 9 Feb 2014 18:39:11 +0000 (19:39 +0100)]
Merge commit '722554788b77c13748e83458f626a9ac38b70072'

* commit '722554788b77c13748e83458f626a9ac38b70072':
  Add raw HEVC muxer

Conflicts:
libavformat/version.h

See: ef5d32b9c5313a1e4491d7f647deae5cb76ca4b0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp8: fix PPC assembly to work if src_stride != dst_stride
Ronald S. Bultje [Wed, 5 Feb 2014 07:59:45 +0000 (07:59 +0000)]
vp8: fix PPC assembly to work if src_stride != dst_stride

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
6 years agomxfdec: free descriptor extradata in .read_close()
Janne Grunau [Sat, 8 Feb 2014 11:52:32 +0000 (12:52 +0100)]
mxfdec: free descriptor extradata in .read_close()

Fixes memleak in fate-mxf-demux.

6 years agoasvenc: free avctx->coded_frame on codec close
Janne Grunau [Sat, 8 Feb 2014 11:26:13 +0000 (12:26 +0100)]
asvenc: free avctx->coded_frame on codec close

6 years agovp9: fix compilation with !HAVE_FAST_64BIT.
Clément Bœsch [Sun, 9 Feb 2014 17:44:07 +0000 (18:44 +0100)]
vp9: fix compilation with !HAVE_FAST_64BIT.

Spotted-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
6 years agoarm: Remove a stray .fpu directive
Martin Storsjö [Sat, 8 Feb 2014 23:34:44 +0000 (23:34 +0000)]
arm: Remove a stray .fpu directive

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agodnxhddec: return proper error code
Alexandra Khirnova [Sat, 8 Feb 2014 20:25:35 +0000 (20:25 +0000)]
dnxhddec: return proper error code

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agolavf: default .ogg audio to libvorbis if we can
Andrew Kelley [Sat, 8 Feb 2014 16:18:57 +0000 (16:18 +0000)]
lavf: default .ogg audio to libvorbis if we can

Since 2007, the Xiph.org Foundation recommends that .ogg only be used
for Ogg Vorbis audio files.

Source: http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions

However we only do it if we have libvorbis available because the
built in vorbis encoder is not as good.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agovp9: invert order in l[] intra prediction array.
Ronald S. Bultje [Sun, 9 Feb 2014 00:32:18 +0000 (19:32 -0500)]
vp9: invert order in l[] intra prediction array.

The directional intra predictors either don't care about order (dc, h,
dc_left, tm), or they prefer inverted order (vr, dr, hd). This allows
more efficient SIMD implementations.

6 years agovp9: remove memset in loopfilter level setting loop.
Ronald S. Bultje [Sat, 8 Feb 2014 22:03:21 +0000 (17:03 -0500)]
vp9: remove memset in loopfilter level setting loop.

Use same function for segmentation map writing also.

6 years agovp9: coef decoding context-splat speedup.
Ronald S. Bultje [Sat, 25 Jan 2014 17:55:55 +0000 (12:55 -0500)]
vp9: coef decoding context-splat speedup.

6 years agovp9: decode_mode context optimizations.
Ronald S. Bultje [Sat, 25 Jan 2014 02:53:22 +0000 (21:53 -0500)]
vp9: decode_mode context optimizations.

6 years agovp9: more aligned zeroes.
Ronald S. Bultje [Thu, 23 Jan 2014 01:51:54 +0000 (20:51 -0500)]
vp9: more aligned zeroes.

6 years agovp9: faster skip-block coefficient blanking.
Ronald S. Bultje [Sat, 25 Jan 2014 02:54:15 +0000 (21:54 -0500)]
vp9: faster skip-block coefficient blanking.

6 years agovp9: coef context reading optimization.
Ronald S. Bultje [Wed, 22 Jan 2014 01:08:18 +0000 (20:08 -0500)]
vp9: coef context reading optimization.

6 years agovp9: just disallow temporal or no-update segmentation on size-change.
Ronald S. Bultje [Sun, 9 Feb 2014 01:47:44 +0000 (20:47 -0500)]
vp9: just disallow temporal or no-update segmentation on size-change.

The spec doesn't describe how it should be decoded so this is probably
the safest thing to do. Fixes valgrind errors on fuzzed11.ivf and fixes
valgrind errors on fuzzed10.ivf differently.

6 years agolavd: add decklink output device
Ramiro Polla [Sat, 8 Feb 2014 20:01:26 +0000 (18:01 -0200)]
lavd: add decklink output device

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/dvbsubdec: DVB subtitles decoder: support of 5 bytes extradata format
mrlika [Mon, 3 Feb 2014 12:11:05 +0000 (14:11 +0200)]
avcodec/dvbsubdec: DVB subtitles decoder: support of 5 bytes extradata format

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agog2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO
Maxim Poliakovski [Mon, 21 Oct 2013 22:17:22 +0000 (00:17 +0200)]
g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
6 years agoAdd raw HEVC muxer
Derek Buitenhuis [Wed, 2 Oct 2013 14:46:25 +0000 (14:46 +0000)]
Add raw HEVC muxer

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoAdd raw HEVC muxer
Derek Buitenhuis [Wed, 2 Oct 2013 14:46:25 +0000 (14:46 +0000)]
Add raw HEVC muxer

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 9 Feb 2014 01:36:46 +0000 (02:36 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mlp_parser: fix request_channel_layout behavior.

Conflicts:
libavcodec/mlp_parser.c

See: bd35d58463f01f7781df052864ae16f5e228c1bc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f90a4bfc43c9192e89d9b4c81d80789cd9b38a2f'
Michael Niedermayer [Sun, 9 Feb 2014 00:29:53 +0000 (01:29 +0100)]
Merge commit 'f90a4bfc43c9192e89d9b4c81d80789cd9b38a2f'

* commit 'f90a4bfc43c9192e89d9b4c81d80789cd9b38a2f':
  mlpdec: fix request_channel_layout behavior.

See: 1a8050ad616c9682f44671c6febb6030a8e3b71e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agog2meet: Validate bpp and bitmasks in the display info
Maxim Poliakovski [Sat, 8 Feb 2014 22:17:08 +0000 (23:17 +0100)]
g2meet: Validate bpp and bitmasks in the display info

That prevents processing of media files with
incompatible or unsupported settings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agog2meet: factor out chunk seeking
Maxim Poliakovski [Sat, 8 Feb 2014 21:27:51 +0000 (22:27 +0100)]
g2meet: factor out chunk seeking

This version requires fewer code and is safer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agog2meet: Rename FRAME_INFO to more appropriate DISPLAY_INFO
Maxim Poliakovski [Mon, 21 Oct 2013 22:17:22 +0000 (00:17 +0200)]
g2meet: Rename FRAME_INFO to more appropriate DISPLAY_INFO

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: don't allow retaining old segmentation maps after a size change.
Ronald S. Bultje [Sat, 8 Feb 2014 20:48:19 +0000 (15:48 -0500)]
vp9: don't allow retaining old segmentation maps after a size change.

Fixes valgrind warnings on fuzzed10.ivf.

6 years agomlp_parser: fix request_channel_layout behavior.
Tim Walker [Sat, 8 Feb 2014 17:21:14 +0000 (17:21 +0000)]
mlp_parser: fix request_channel_layout behavior.

When request_channel_layout is 0,
all substreams should be decoded.

Thanks to Michael Niedermayer for spotting.

Also fix a mismatch between the parser and
decoder when request_channel_layout is a
subset of Stereo.