ffmpeg.git
7 years agovp9_parse: don't use AVCodecParserContext as av_log context.
Ronald S. Bultje [Sun, 5 Jan 2014 18:32:03 +0000 (13:32 -0500)]
vp9_parse: don't use AVCodecParserContext as av_log context.

Fixes trac ticket 3273.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/vf_format: check that the format list is not empty
Michael Niedermayer [Sun, 5 Jan 2014 19:14:03 +0000 (20:14 +0100)]
avfilter/vf_format: check that the format list is not empty

Fixes Ticket3210

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopulse: get latency only when needed
Federico Simoncelli [Sun, 5 Jan 2014 12:04:46 +0000 (13:04 +0100)]
pulse: get latency only when needed

Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopulse: set time_base as multiple of sample_rate
Federico Simoncelli [Sun, 5 Jan 2014 12:03:14 +0000 (13:03 +0100)]
pulse: set time_base as multiple of sample_rate

The stream time_base has been changed to be a multiple of the
device sample_rate. Now the frame_duration computation is simpler
and a message will warn about problematic frame_size values.

Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/nutdec: remove unused variable
Michael Niedermayer [Sun, 5 Jan 2014 16:27:23 +0000 (17:27 +0100)]
avformat/nutdec: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agov4l2: setting device parameters early
Federico Simoncelli [Thu, 2 Jan 2014 15:25:48 +0000 (16:25 +0100)]
v4l2: setting device parameters early

Setting the v4l2 device parameters may influence video properties
such as width, height and pixel format.
This patch moves v4l2_set_parameters to be executed before fetching
the video properties, avoiding errors such as (pal vs ntsc):

 The v4l2 frame is 829440 bytes, but 691200 bytes are expected

Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 5 Jan 2014 12:29:34 +0000 (13:29 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Support preprocessor macros as header names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: Support preprocessor macros as header names
Diego Biurrun [Mon, 23 Dec 2013 00:03:48 +0000 (01:03 +0100)]
configure: Support preprocessor macros as header names

New versions of FreeType have moved the location of their API
header(s) and hide the location behind a macro.

Since the location changes between versions and no other way
to know the location exists, this workaround becomes necessary.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoavformat/matroskaenc: warn when muxing video codec not supported by format
Peter Ross [Sun, 5 Jan 2014 01:04:29 +0000 (12:04 +1100)]
avformat/matroskaenc: warn when muxing video codec not supported by format

This occurs for video codecs that have codec_tag set, but are are not listed
in ff_codec_bmp_tags (e.g. AV_CODEC_ID_BINKAUDIO, AV_CODEC_ID_IFF_ILBM).

Fixes ticket #3269.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 5 Jan 2014 01:37:42 +0000 (02:37 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sdp: Check that fmt->oformat is non-null before accessing it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9d18a7d3ec09d6d933d648570643fde924aa391a'
Michael Niedermayer [Sun, 5 Jan 2014 01:25:03 +0000 (02:25 +0100)]
Merge commit '9d18a7d3ec09d6d933d648570643fde924aa391a'

* commit '9d18a7d3ec09d6d933d648570643fde924aa391a':
  fate: Update AAC ELD 5.1 ref for recent bugfixes.

also reenable fate-aac-er_ad6000np_44_ep0, as this commit updates the pcm
reference, so that the test works again

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7f29644108c5fbd80f160930b31b78b8704c1a49'
Michael Niedermayer [Sun, 5 Jan 2014 01:18:51 +0000 (02:18 +0100)]
Merge commit '7f29644108c5fbd80f160930b31b78b8704c1a49'

* commit '7f29644108c5fbd80f160930b31b78b8704c1a49':
  aac: Fix low delay windowing.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '42d1b41983971da63302ac3d12091cad1f3d6324'
Michael Niedermayer [Sun, 5 Jan 2014 01:09:49 +0000 (02:09 +0100)]
Merge commit '42d1b41983971da63302ac3d12091cad1f3d6324'

* commit '42d1b41983971da63302ac3d12091cad1f3d6324':
  fate: Add a test vector for AAC ELD with TNS.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b2212dec0f011893ec68eecaa990170fa24050d7'
Michael Niedermayer [Sun, 5 Jan 2014 00:48:29 +0000 (01:48 +0100)]
Merge commit 'b2212dec0f011893ec68eecaa990170fa24050d7'

* commit 'b2212dec0f011893ec68eecaa990170fa24050d7':
  aac: Fix TNS decoding for the 512 sample window family.

also temporarily disable fate-aac-er_ad6000np_44_ep0 as this commit
causes a mismatch with the reference pcm file
The test will be reenabled after all fixes and with a new pcm reference

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e2096e2eaa9e75663d6bf0c37d342752aa5a146d'
Michael Niedermayer [Sun, 5 Jan 2014 00:13:06 +0000 (01:13 +0100)]
Merge commit 'e2096e2eaa9e75663d6bf0c37d342752aa5a146d'

* commit 'e2096e2eaa9e75663d6bf0c37d342752aa5a146d':
  fate: Add a downsampled SBR testvector

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/mp3dec: fix start time in light of initial skip samples
Michael Niedermayer [Sat, 4 Jan 2014 23:50:26 +0000 (00:50 +0100)]
avformat/mp3dec: fix start time in light of initial skip samples

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/file: fix help message first character casing for trunc option
Stefano Sabatini [Sat, 4 Jan 2014 23:50:22 +0000 (00:50 +0100)]
lavf/file: fix help message first character casing for trunc option

7 years agodoc/protocols/file: fix semantical reverse
Stefano Sabatini [Sat, 4 Jan 2014 23:41:20 +0000 (00:41 +0100)]
doc/protocols/file: fix semantical reverse

Change "read" to "write" in introductory description.

Spotted-by: Alexander Strasser <eclipse7@gmx.net>
7 years agodoc/protocols/file: document general file protocol URL syntax
Stefano Sabatini [Sat, 4 Jan 2014 13:48:23 +0000 (14:48 +0100)]
doc/protocols/file: document general file protocol URL syntax

Also drop confusing ff* tools reference about exceptions to the
file:FILENAME syntax, which is not ff* tool specific.

With various edits by Alexander Strasser <eclipse7@gmx.net>.

7 years agosdp: Check that fmt->oformat is non-null before accessing it
Martin Storsjö [Fri, 3 Jan 2014 13:47:02 +0000 (15:47 +0200)]
sdp: Check that fmt->oformat is non-null before accessing it

This avoids crashes when avserver tries to create an SDP, since
d77f4af.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agofate: Update AAC ELD 5.1 ref for recent bugfixes.
Alex Converse [Tue, 24 Dec 2013 06:21:08 +0000 (22:21 -0800)]
fate: Update AAC ELD 5.1 ref for recent bugfixes.

7 years agoaac: Fix low delay windowing.
Alex Converse [Tue, 24 Dec 2013 21:03:26 +0000 (13:03 -0800)]
aac: Fix low delay windowing.

AAC LD uses a low overlap sine window instead of a KBD window.

7 years agofate: Add a test vector for AAC ELD with TNS.
Alex Converse [Tue, 24 Dec 2013 06:35:48 +0000 (22:35 -0800)]
fate: Add a test vector for AAC ELD with TNS.

7 years agoaac: Fix TNS decoding for the 512 sample window family.
Alex Converse [Tue, 24 Dec 2013 06:20:42 +0000 (22:20 -0800)]
aac: Fix TNS decoding for the 512 sample window family.

7 years agofate: Add a downsampled SBR testvector
Alex Converse [Mon, 23 Dec 2013 20:07:45 +0000 (12:07 -0800)]
fate: Add a downsampled SBR testvector

7 years agolavf/file: file_check: Handle file URLs that start with "file:"
Alexander Strasser [Thu, 2 Jan 2014 18:00:15 +0000 (19:00 +0100)]
lavf/file: file_check: Handle file URLs that start with "file:"

Handle the URL analog to file_open, it may contain a "file:"
prefix. Skip it. Make access checks to file URLs starting
with "file:" work.

Fix part of ticket #3249.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
7 years agoavformat/oggparseopus: fix segmented timestamps
Mark Harris [Tue, 31 Dec 2013 19:04:54 +0000 (11:04 -0800)]
avformat/oggparseopus: fix segmented timestamps

Fix timestamp calculation for code 3 Ogg Opus packets with less than
2 bytes in the last segment (e.g. packet length 255 or 256).
A sample that would seek incorrectly in ffplay can be created with:
  ffmpeg -i in.wav -b:a 34k -vbr off -frame_duration 60 out.opus
and libopus 1.1

Also do not read past the end of the buffer when a packet has length 0.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/oggdec: dont read timestamps from EOS pages of ogm videos
Michael Niedermayer [Sat, 4 Jan 2014 16:33:59 +0000 (17:33 +0100)]
avformat/oggdec: dont read timestamps from EOS pages of ogm videos

Some muxers store invalid timestamps there, which breaks seeking
Fixes Ticket2739

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/utils: fix rounding error accumulation for generated dts in compute_pkt_fields()
Michael Niedermayer [Fri, 3 Jan 2014 16:44:15 +0000 (17:44 +0100)]
avformat/utils: fix rounding error accumulation for generated dts in compute_pkt_fields()

This only updates the case where there is no B frame reordering delay.

Tested-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/rational: av_add_stable() test code
Michael Niedermayer [Fri, 3 Jan 2014 16:35:09 +0000 (17:35 +0100)]
avutil/rational: av_add_stable() test code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/mathematics: add av_add_stable()
Michael Niedermayer [Fri, 3 Jan 2014 16:30:50 +0000 (17:30 +0100)]
avutil/mathematics: add av_add_stable()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoChangelog: add nuts side & metadata support
Michael Niedermayer [Sat, 4 Jan 2014 14:07:52 +0000 (15:07 +0100)]
Changelog: add nuts side & metadata support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/nut: add support for per frame side & meta data with version 4
Michael Niedermayer [Mon, 23 Dec 2013 01:58:36 +0000 (02:58 +0100)]
avformat/nut: add support for per frame side & meta data with version 4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 4 Jan 2014 12:19:46 +0000 (13:19 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Use the matching endfunc macro instead of the assembler directive directly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '2ad4ee345a4216aef3999f57dd14c56128d27a13'
Michael Niedermayer [Sat, 4 Jan 2014 12:13:07 +0000 (13:13 +0100)]
Merge commit '2ad4ee345a4216aef3999f57dd14c56128d27a13'

* commit '2ad4ee345a4216aef3999f57dd14c56128d27a13':
  arm: Add a missing endfunc macro call

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoarm: Use the matching endfunc macro instead of the assembler directive directly
Martin Storsjö [Fri, 3 Jan 2014 09:39:10 +0000 (11:39 +0200)]
arm: Use the matching endfunc macro instead of the assembler directive directly

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoarm: Add a missing endfunc macro call
Martin Storsjö [Fri, 3 Jan 2014 09:36:08 +0000 (11:36 +0200)]
arm: Add a missing endfunc macro call

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavfilter/lut3d: fix channel order in Iridas format parsing.
Clément Bœsch [Sat, 4 Jan 2014 08:31:40 +0000 (09:31 +0100)]
avfilter/lut3d: fix channel order in Iridas format parsing.

According to http://doc.iridas.com/index.php?title=LUT_Formats

    for 3D textures, the data is also RGB, and ordered in such a way
    that the red coordinate changes fastest, then the green coordinate,
    and finally, the blue coordinate changes slowest:

Fixes Ticket #3236.

7 years agoavcodec/rv30: put the rpr check back in init with the max vs bits bug fixed
Michael Niedermayer [Sat, 4 Jan 2014 03:18:43 +0000 (04:18 +0100)]
avcodec/rv30: put the rpr check back in init with the max vs bits bug fixed

Its usefull to know immediatly if extradata is wrong and not just when later
the decoder tries to use it.

This check was removed by: a6a2282c25abe43e352010a7c3fbc92994c0bc1c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/rv30: check rpr before use against maximum
Michael Niedermayer [Sat, 4 Jan 2014 03:17:15 +0000 (04:17 +0100)]
avcodec/rv30: check rpr before use against maximum

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/rv30: cleanup rpr handling
Michael Niedermayer [Sat, 4 Jan 2014 03:16:46 +0000 (04:16 +0100)]
avcodec/rv30: cleanup rpr handling

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/rv10: cleanup rpr handling
Michael Niedermayer [Sat, 4 Jan 2014 03:15:22 +0000 (04:15 +0100)]
avcodec/rv10: cleanup rpr handling

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 4 Jan 2014 02:13:54 +0000 (03:13 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: remove disabled bfin asm

Conflicts:
libavcodec/bfin/mpegvideo_bfin.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a4d0c6e0503562d4cc8f9f6d02d84d7b32583b15'
Michael Niedermayer [Sat, 4 Jan 2014 02:03:02 +0000 (03:03 +0100)]
Merge commit 'a4d0c6e0503562d4cc8f9f6d02d84d7b32583b15'

* commit 'a4d0c6e0503562d4cc8f9f6d02d84d7b32583b15':
  mpegvideo: move dct_unquantize functions up to avoid forward declarations

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'aec25b1c4650944d32706bfd40eb02bbd5587303'
Michael Niedermayer [Sat, 4 Jan 2014 01:56:29 +0000 (02:56 +0100)]
Merge commit 'aec25b1c4650944d32706bfd40eb02bbd5587303'

* commit 'aec25b1c4650944d32706bfd40eb02bbd5587303':
  mpegvideo: split the encoding-only parts of frame_start() into a separate function

Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b318106fae65149356934fc72feafef3272fd4ea'
Michael Niedermayer [Sat, 4 Jan 2014 01:40:32 +0000 (02:40 +0100)]
Merge commit 'b318106fae65149356934fc72feafef3272fd4ea'

* commit 'b318106fae65149356934fc72feafef3272fd4ea':
  FATE: add a test for the lavr mixing case fixed in fc6a3ef40d34ce8443ae57c2452f3f273d7d4891

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a8cc88b1a23dc1515f27cfa98af16a273c539091'
Michael Niedermayer [Sat, 4 Jan 2014 01:34:55 +0000 (02:34 +0100)]
Merge commit 'a8cc88b1a23dc1515f27cfa98af16a273c539091'

* commit 'a8cc88b1a23dc1515f27cfa98af16a273c539091':
  tests/Makefile: allow FILTER* to be called with lists of filter names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'cc976a75dffa148d655b52604331679ff669e8a2'
Michael Niedermayer [Sat, 4 Jan 2014 01:29:38 +0000 (02:29 +0100)]
Merge commit 'cc976a75dffa148d655b52604331679ff669e8a2'

* commit 'cc976a75dffa148d655b52604331679ff669e8a2':
  audio_mix: print (SKIP) instead of 0.0 for matrix columns removed along with output zeroing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'fc6a3ef40d34ce8443ae57c2452f3f273d7d4891'
Michael Niedermayer [Sat, 4 Jan 2014 01:16:30 +0000 (02:16 +0100)]
Merge commit 'fc6a3ef40d34ce8443ae57c2452f3f273d7d4891'

* commit 'fc6a3ef40d34ce8443ae57c2452f3f273d7d4891':
  audio_mix: fix zeroing output channels in certain cases

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3d95d27376e59de14f984e7a22a52e066d85df35'
Michael Niedermayer [Sat, 4 Jan 2014 01:11:29 +0000 (02:11 +0100)]
Merge commit '3d95d27376e59de14f984e7a22a52e066d85df35'

* commit '3d95d27376e59de14f984e7a22a52e066d85df35':
  audio_mix: initialize the data pointers to NULL

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '58312b2472d3a44d7458865c459d59ef2e02bf1a'
Michael Niedermayer [Sat, 4 Jan 2014 01:05:08 +0000 (02:05 +0100)]
Merge commit '58312b2472d3a44d7458865c459d59ef2e02bf1a'

* commit '58312b2472d3a44d7458865c459d59ef2e02bf1a':
  h264: reset data_partitioning if decoding the slice header for NAL_DPA fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e89aa4bf56e5b5c45f569eb12733519789e057da'
Michael Niedermayer [Sat, 4 Jan 2014 00:43:01 +0000 (01:43 +0100)]
Merge commit 'e89aa4bf56e5b5c45f569eb12733519789e057da'

* commit 'e89aa4bf56e5b5c45f569eb12733519789e057da':
  lzw: switch to bytestream2

Conflicts:
libavcodec/lzw.c

See: 44c4170c52c10e3da3a7ea8e3435ef37c4edc2cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d'
Michael Niedermayer [Sat, 4 Jan 2014 00:35:17 +0000 (01:35 +0100)]
Merge commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d'

* commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d':
  pmpdec: check that there is at least one audio packet.

Conflicts:
libavformat/pmpdec.c

See: 8b1cd25ca7e64e6128fa2902d78e48bfeeec9786
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '94a417acc05cc5151b473abc0bf51fad26f8c5a0'
Michael Niedermayer [Sat, 4 Jan 2014 00:18:33 +0000 (01:18 +0100)]
Merge commit '94a417acc05cc5151b473abc0bf51fad26f8c5a0'

* commit '94a417acc05cc5151b473abc0bf51fad26f8c5a0':
  mathematics: remove asserts from av_rescale_rnd()

Conflicts:
libavutil/mathematics.c

The asserts are left in place for now as no code checks the return
value, but we sure can change this if application developers
prefer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c'
Michael Niedermayer [Sat, 4 Jan 2014 00:05:52 +0000 (01:05 +0100)]
Merge commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c'

* commit '24057c83207d6ea8bfd824155ac37be8a33dfd0c':
  eacmv: check the framerate before setting it.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5569146d48f06564e8fa393424782cceed510916'
Michael Niedermayer [Fri, 3 Jan 2014 23:50:19 +0000 (00:50 +0100)]
Merge commit '5569146d48f06564e8fa393424782cceed510916'

* commit '5569146d48f06564e8fa393424782cceed510916':
  adx: check that the offset is not negative

See: 30bce34b6719ca99ad72c62e2fba3eade71f1eae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c'
Michael Niedermayer [Fri, 3 Jan 2014 23:34:52 +0000 (00:34 +0100)]
Merge commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c'

* commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c':
  rv30: fix extradata size check.

Conflicts:
libavcodec/rv30.c

See: 09c5f990bc7629dfbee8c760fd485936c60a7b40
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'feded990e3ef9af4a0b827d5b6d8fe86f0b94942'
Michael Niedermayer [Fri, 3 Jan 2014 23:16:08 +0000 (00:16 +0100)]
Merge commit 'feded990e3ef9af4a0b827d5b6d8fe86f0b94942'

* commit 'feded990e3ef9af4a0b827d5b6d8fe86f0b94942':
  mpegvideo: set reference/pict_type on generated reference frames

Conflicts:
libavcodec/mpegvideo.c

The picture type is left at P type as it was explicitly set before

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/utils: fix order of buffers in timestamp update code
Michael Niedermayer [Fri, 3 Jan 2014 22:27:28 +0000 (23:27 +0100)]
avformat/utils: fix order of buffers in timestamp update code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/mpegvideo: fix ac/dc_val and coded_block table sizes
Michael Niedermayer [Fri, 3 Jan 2014 19:20:12 +0000 (20:20 +0100)]
avcodec/mpegvideo: fix ac/dc_val and coded_block table sizes

With interlaced vc1 it was possible that accesses could happen outside these
tables before this.

Regression since 017e234c204f8ffb5f85a073231247881be1ac6f
Reproduced with a sample from Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Fixes (again) : 480i30__codec_WVC1__mode_2__framerate_29.970__type_2__preproc_17.SIGFPE.bfa.390.wmv
No releases are affected by this

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/mathematics: fix 2 typos in the doxy
Michael Niedermayer [Fri, 3 Jan 2014 15:54:06 +0000 (16:54 +0100)]
avutil/mathematics: fix 2 typos in the doxy

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/faq: remove "-profile option fails when encoding H.264 video with AAC audio"...
Stefano Sabatini [Fri, 3 Jan 2014 12:38:49 +0000 (13:38 +0100)]
doc/faq: remove "-profile option fails when encoding H.264 video with AAC audio" entry

The error was fixed in commit ce9bd303794fcc94aa232c116bece13c5994b55b
more than one year ago, and does not affect all the currently supported
versions.

In particular, fix trac issue #1535.

7 years agodoc/ffserver: mention how to access streams through RTSP
Stefano Sabatini [Fri, 3 Jan 2014 12:10:51 +0000 (13:10 +0100)]
doc/ffserver: mention how to access streams through RTSP

7 years agompegvideo: remove disabled bfin asm
Anton Khirnov [Tue, 3 Dec 2013 07:07:24 +0000 (08:07 +0100)]
mpegvideo: remove disabled bfin asm

It has been disabled as 'broken' over 3 years ago in b716a792

7 years agompegvideo: move dct_unquantize functions up to avoid forward declarations
Anton Khirnov [Tue, 3 Dec 2013 06:52:33 +0000 (07:52 +0100)]
mpegvideo: move dct_unquantize functions up to avoid forward declarations

7 years agompegvideo: split the encoding-only parts of frame_start() into a separate function
Anton Khirnov [Tue, 3 Dec 2013 06:48:09 +0000 (07:48 +0100)]
mpegvideo: split the encoding-only parts of frame_start() into a separate function

This introduces some code duplication. However, much of it should go
away once the decoders stop using MpegEncContext.

7 years agoFATE: add a test for the lavr mixing case fixed in fc6a3ef40d34ce8443ae57c2452f3f273d...
Anton Khirnov [Mon, 16 Dec 2013 20:30:39 +0000 (21:30 +0100)]
FATE: add a test for the lavr mixing case fixed in fc6a3ef40d34ce8443ae57c2452f3f273d7d4891

7 years agotests/Makefile: allow FILTER* to be called with lists of filter names
Anton Khirnov [Mon, 16 Dec 2013 21:21:01 +0000 (22:21 +0100)]
tests/Makefile: allow FILTER* to be called with lists of filter names

7 years agoaudio_mix: print (SKIP) instead of 0.0 for matrix columns removed along with output...
Anton Khirnov [Mon, 16 Dec 2013 18:05:45 +0000 (19:05 +0100)]
audio_mix: print (SKIP) instead of 0.0 for matrix columns removed along with output zeroing

7 years agoaudio_mix: fix zeroing output channels in certain cases
Anton Khirnov [Mon, 16 Dec 2013 17:44:15 +0000 (18:44 +0100)]
audio_mix: fix zeroing output channels in certain cases

Specifically, when the corresponding input channel exists and its matrix
column is all-zero (which is necessary for zeroing the output), the
matrix column must be removed from the matrix.

This is not done currently, so the mixing code would end up using
uninitialized pointers from stack.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
7 years agoaudio_mix: initialize the data pointers to NULL
Anton Khirnov [Mon, 16 Dec 2013 17:20:41 +0000 (18:20 +0100)]
audio_mix: initialize the data pointers to NULL

This should make it easier to catch problems where some of those
pointers are used uninitialized, since reading from NULL should always
crash, while random numbers from stack can turn out to be valid
pointers, so random memory may be silently overwritten.

7 years agoh264: reset data_partitioning if decoding the slice header for NAL_DPA fails
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: reset data_partitioning if decoding the slice header for NAL_DPA fails

If it was set before then we can end up trying to decode a slice without
a valid slice header, which can lead to invalid memory access.

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

7 years agolzw: switch to bytestream2
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
lzw: switch to bytestream2

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

7 years agopmpdec: check that there is at least one audio packet.
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
pmpdec: check that there is at least one audio packet.

The code cannot handle there being none, but that should not happen for
valid files.

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

7 years agomathematics: remove asserts from av_rescale_rnd()
Anton Khirnov [Thu, 12 Dec 2013 06:34:13 +0000 (07:34 +0100)]
mathematics: remove asserts from av_rescale_rnd()

It is a public function, it must not assert on its parameters.

7 years agoeacmv: check the framerate before setting it.
Anton Khirnov [Thu, 12 Dec 2013 06:31:26 +0000 (07:31 +0100)]
eacmv: check the framerate before setting it.

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

7 years agoadx: check that the offset is not negative
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
adx: check that the offset is not negative

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

7 years agorv30: fix extradata size check.
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
rv30: fix extradata size check.

It has been checking the number of bits in the offset instead of the
actual offset.

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

7 years agompegvideo: set reference/pict_type on generated reference frames
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
mpegvideo: set reference/pict_type on generated reference frames

Otherwise the generic code will unref them, which can then result in
last_picture_ptr == current_picture_ptr, which causes deadlocks at least
in rv40.

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

7 years agoavcodec/avcodec: document that some video decoders do not support linesizes changing...
Michael Niedermayer [Fri, 3 Jan 2014 14:11:38 +0000 (15:11 +0100)]
avcodec/avcodec: document that some video decoders do not support linesizes changing between frames.

Omission in the documentation found by: Sebastian Dröge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/bink: display audio track ids
Peter Ross [Fri, 3 Jan 2014 11:18:36 +0000 (22:18 +1100)]
avformat/bink: display audio track ids

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMAINTAINERS: add myself for spdif* and hls.c
Anssi Hannula [Fri, 3 Jan 2014 12:55:52 +0000 (14:55 +0200)]
MAINTAINERS: add myself for spdif* and hls.c

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
7 years agoavformat/hls: decouple playlists from variants
Anssi Hannula [Fri, 27 Dec 2013 11:01:10 +0000 (13:01 +0200)]
avformat/hls: decouple playlists from variants

Not all "sub-playlists" are variant playlists (containing the same
content with a different bitrate, etc) in the current version of the HLS
specification. They can now also be alternative renditions, containing
e.g. alternative audio tracks etc.

Decouple playlists from variants to prepare for handling the new
features.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
7 years agoavformat/http: always allow no-op seek
Anssi Hannula [Mon, 30 Dec 2013 10:46:32 +0000 (12:46 +0200)]
avformat/http: always allow no-op seek

This also allows checking stream position as per ffurl_seek() doxy.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
7 years agoavformat/bink: seek to first frame
Peter Ross [Fri, 3 Jan 2014 10:31:11 +0000 (21:31 +1100)]
avformat/bink: seek to first frame

Some rare bink files include unused bytes between the frame table index
and first frame data.

Fixes ticket #3266.

This patch has also been tested with non-seekable protocols.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomatroskadec: Export the MuxingApp element value as metadata
James Almer [Sun, 24 Nov 2013 08:31:48 +0000 (05:31 -0300)]
matroskadec: Export the MuxingApp element value as metadata

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: do not fail when options are routed to libavformat and libavcodec and only...
Michael Niedermayer [Fri, 3 Jan 2014 01:16:35 +0000 (02:16 +0100)]
ffmpeg: do not fail when options are routed to libavformat and libavcodec and only one can be used

Fixes setting frame_size for pulse demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: Clear ERContext.cur_pic when unref'ing current picture.
Dale Curtis [Thu, 2 Jan 2014 22:29:38 +0000 (14:29 -0800)]
h264: Clear ERContext.cur_pic when unref'ing current picture.

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
7 years agoavcodec/mace: check buffer size
Michael Niedermayer [Thu, 2 Jan 2014 18:10:57 +0000 (19:10 +0100)]
avcodec/mace: check buffer size

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f9d2775e090_8782_surge-2-8-MAC3.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomp3on4: fail when the header check fails
Michael Niedermayer [Thu, 2 Jan 2014 17:45:36 +0000 (18:45 +0100)]
mp3on4: fail when the header check fails

It seems the code assumed that when one out of multiple blocks fail
some span of time is correct, its not, its some channels
that are correct

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f44a03ba3ce_5692_id5_1.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/aacps: fix number of bands used with ipd/opd
Michael Niedermayer [Thu, 2 Jan 2014 16:46:21 +0000 (17:46 +0100)]
avcodec/aacps: fix number of bands used with ipd/opd

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f861d16355f_1664_File1_fixed.aac
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/iff: ensure that runs with insufficient input dont leave uninitialized bytes...
Michael Niedermayer [Thu, 2 Jan 2014 13:50:48 +0000 (14:50 +0100)]
avcodec/iff: ensure that runs with insufficient input dont leave uninitialized bytes in the output

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fa0dea15eae_8988_test.iff
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/bink: recognize bink2 files
Peter Ross [Thu, 2 Jan 2014 08:34:45 +0000 (19:34 +1100)]
avformat/bink: recognize bink2 files

Support demuxing of audio streams in bink2 files.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/muxers/hls: change "can used" to "can be used"
Stefano Sabatini [Thu, 2 Jan 2014 08:32:37 +0000 (09:32 +0100)]
doc/muxers/hls: change "can used" to "can be used"

Spotted-by: Alexander Strasser <eclipse7@gmx.net>
7 years agofate: Add OggVP8 demux test
James Almer [Tue, 31 Dec 2013 08:07:03 +0000 (05:07 -0300)]
fate: Add OggVP8 demux test

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoatrac3plus: Add forgotten initialization of an internal struct
Maxim Poliakovski [Wed, 1 Jan 2014 22:25:15 +0000 (23:25 +0100)]
atrac3plus: Add forgotten initialization of an internal struct

This patch also fixes trac ticket 3254.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/doxy: remove unused files
Michael Niedermayer [Fri, 27 Dec 2013 12:24:48 +0000 (13:24 +0100)]
doc/doxy: remove unused files

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 2 Jan 2014 00:53:31 +0000 (01:53 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Makefile: add html template files to the doxygen deps

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/muxers/segment: clarify ambiguos reference
Stefano Sabatini [Wed, 1 Jan 2014 23:33:01 +0000 (00:33 +0100)]
doc/muxers/segment: clarify ambiguos reference

Replace "The segmenter muxer" with "This muxer". The "segmenter muxer"
was never defined before, and thus it is a slightly ambiguous term.

7 years agodoc/muxers/segment: reference hls muxer
Stefano Sabatini [Wed, 1 Jan 2014 23:31:49 +0000 (00:31 +0100)]
doc/muxers/segment: reference hls muxer