ffmpeg.git
6 years agoffv1: split decoder and encoder
Michael Niedermayer [Sun, 21 Oct 2012 12:05:46 +0000 (14:05 +0200)]
ffv1: split decoder and encoder

This is not based on lucas work due to code divergence (its less work this way
than trying to merge from a split based on 2 years outdated code)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9'
Michael Niedermayer [Sun, 21 Oct 2012 11:29:03 +0000 (13:29 +0200)]
Merge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9'

* commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9':
  avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility
  avutil: make some tables visible again
  avutil: remove inline av_log2 from public API
  celp_math: rename ff_log2 to ff_log2_q15

Conflicts:
libavutil/libavutil.v

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1: fix gray
Michael Niedermayer [Sun, 21 Oct 2012 02:25:30 +0000 (04:25 +0200)]
ffv1: fix gray

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomp3demux: Rewrite xing TOC based seeking
Michael Niedermayer [Sun, 21 Oct 2012 00:42:16 +0000 (02:42 +0200)]
mp3demux: Rewrite xing TOC based seeking

The libav code depends on mp3 startcodes only occuring at the start of
frames. But there is nothing in mp3 that prevents them occuring elsewhere
by chance. Thus the code would fail randomly, the new code searches for 3
consecutive valid frames. If this turns out to be still insufficient the
number can be raised further, or additional checks added.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomp3dec: propagate error code correctly.
Michael Niedermayer [Sat, 20 Oct 2012 23:31:53 +0000 (01:31 +0200)]
mp3dec: propagate error code correctly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/silencedetect: increase duration precision.
Clément Bœsch [Sat, 20 Oct 2012 23:28:19 +0000 (01:28 +0200)]
lavfi/silencedetect: increase duration precision.

This should also fix CID717889.

6 years agolavf/webvttdec: fix potential timing overflows.
Clément Bœsch [Sat, 20 Oct 2012 23:16:49 +0000 (01:16 +0200)]
lavf/webvttdec: fix potential timing overflows.

Should fix CID733781 and CID733782.

6 years agolavf/subviewerdec: fix potential timing overflows.
Clément Bœsch [Sat, 20 Oct 2012 23:08:17 +0000 (01:08 +0200)]
lavf/subviewerdec: fix potential timing overflows.

Should fix CID733779 and CID733780.

6 years agoudp: add missing mutex unlock
Michael Niedermayer [Sat, 20 Oct 2012 21:31:32 +0000 (23:31 +0200)]
udp: add missing mutex unlock

Fixes CID703688
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortpdec: check av_new_packet() return value
Michael Niedermayer [Sat, 20 Oct 2012 21:07:16 +0000 (23:07 +0200)]
rtpdec: check av_new_packet() return value

Fixes CID733715
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortmp_write_amf_data: remove dead code
Michael Niedermayer [Sat, 20 Oct 2012 20:57:30 +0000 (22:57 +0200)]
rtmp_write_amf_data: remove dead code

Fixes CID732199
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoriff_has_valid_tags: remove unused variable
Michael Niedermayer [Sat, 20 Oct 2012 20:34:01 +0000 (22:34 +0200)]
riff_has_valid_tags: remove unused variable

Fixes CID739471
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonutdec: fix integer overflow
Michael Niedermayer [Sat, 20 Oct 2012 18:45:32 +0000 (20:45 +0200)]
nutdec: fix integer overflow

Fixes CID700575
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonsvdec: fix division by 0
Michael Niedermayer [Sat, 20 Oct 2012 18:12:13 +0000 (20:12 +0200)]
nsvdec: fix division by 0

Fixes CID717749
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat_free_context: allow NULL as argument
Michael Niedermayer [Sat, 20 Oct 2012 17:48:26 +0000 (19:48 +0200)]
avformat_free_context: allow NULL as argument

Fixes CID703682
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agommsh: fix integer overflow in mmsh_seek()
Michael Niedermayer [Sat, 20 Oct 2012 17:08:41 +0000 (19:08 +0200)]
mmsh: fix integer overflow in mmsh_seek()

Fixes CID703745
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexamples/decoding_encoding: prefer 'frame' over 'picture' for an AVFrame
Stefano Sabatini [Sat, 20 Oct 2012 09:07:16 +0000 (11:07 +0200)]
examples/decoding_encoding: prefer 'frame' over 'picture' for an AVFrame

Decrease confusion.

6 years agomatroskaenc: Fix hypothetical integer overflows
Michael Niedermayer [Sat, 20 Oct 2012 16:47:44 +0000 (18:47 +0200)]
matroskaenc: Fix hypothetical integer overflows

Fixes CID700562-7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskaenc: check avio_open_dyn_buf() retuen code
Michael Niedermayer [Sat, 20 Oct 2012 16:38:36 +0000 (18:38 +0200)]
matroskaenc: check avio_open_dyn_buf() retuen code

Fixes CID703629
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/platform: Add info on shared builds with MSVC
Derek Buitenhuis [Fri, 19 Oct 2012 19:12:07 +0000 (15:12 -0400)]
doc/platform: Add info on shared builds with MSVC

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agodoc/platform: Move a caveat down to the notes section
Derek Buitenhuis [Fri, 19 Oct 2012 18:19:26 +0000 (14:19 -0400)]
doc/platform: Move a caveat down to the notes section

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoReplace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get
Hendrik Leppkes [Sat, 20 Oct 2012 04:43:48 +0000 (06:43 +0200)]
Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskadec: fix double negation typo
Michael Niedermayer [Sat, 20 Oct 2012 14:58:33 +0000 (16:58 +0200)]
matroskadec: fix double negation typo

Fixes CID602563
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroska_parse_rm_audio: check for malloc failure
Michael Niedermayer [Sat, 20 Oct 2012 14:55:45 +0000 (16:55 +0200)]
matroska_parse_rm_audio: check for malloc failure

Fixes CID733712
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobgmc: check the correct pointers
Michael Niedermayer [Sat, 20 Oct 2012 13:32:59 +0000 (15:32 +0200)]
bgmc: check the correct pointers

Fixes CID90539, CID90538
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: revert broken hunk from 1cd9c81ddb317ca00061d11d3562d3a34888d91b
Michael Niedermayer [Sat, 20 Oct 2012 11:59:53 +0000 (13:59 +0200)]
lavc: revert broken hunk from 1cd9c81ddb317ca00061d11d3562d3a34888d91b

This should fix fate failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility
Martin Storsjö [Sat, 20 Oct 2012 10:32:01 +0000 (13:32 +0300)]
avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility

Earlier versions of for instance of libavcodec expect this symbol to be
present in libavutil. This commit can be reverted after the next major
bump.

New shared builds of avcodec will link to the internal copy of the
table within that library, so those builds won't rely on this table
being present in avutil any longer either.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavutil: make some tables visible again
Reinhard Tartler [Fri, 19 Oct 2012 21:34:02 +0000 (23:34 +0200)]
avutil: make some tables visible again

These tables are used for instance by older versions of libavcodec and
need to remain visible until the next SONAME bump.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavutil: remove inline av_log2 from public API
Mans Rullgard [Thu, 18 Oct 2012 17:15:38 +0000 (18:15 +0100)]
avutil: remove inline av_log2 from public API

This removes inline av_log2 and av_log2_16bit from the public API,
instead exporting them as regular functions.  In-tree code still
gets the inline and otherwise optimised variants.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agocelp_math: rename ff_log2 to ff_log2_q15
Mans Rullgard [Thu, 18 Oct 2012 16:59:13 +0000 (17:59 +0100)]
celp_math: rename ff_log2 to ff_log2_q15

This name is more descriptive as the function returns a fixed-point
value with 15 fraction bits.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 20 Oct 2012 11:18:59 +0000 (13:18 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Group math functions into a separate variable
  avutil/mem: K&R formatting cosmetics
  avutil/lzo: K&R formatting cosmetics

Conflicts:
configure
libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'
Michael Niedermayer [Sat, 20 Oct 2012 10:37:52 +0000 (12:37 +0200)]
Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'

* commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed':
  fate-vc1: add dependencies
  ARM: fix overreads in neon h264 chroma mc
  rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet
  gitignore: ignore files created by msvc
  fate: Add proper dependencies for the tests in video.mak
  configure: Disable Snow decoder and encoder by default
  lzo: Drop obsolete fast_memcpy reference
  build: Drop OBJS declaration for non-existing PCM_DVD encoder
  mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all

Conflicts:
libavcodec/mpegvideo.c
libavformat/rtsp.c
tests/fate/microsoft.mak
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/parseutils: rework rational reduction logic in av_parse_ratio()
Stefano Sabatini [Tue, 16 Oct 2012 16:15:58 +0000 (18:15 +0200)]
lavu/parseutils: rework rational reduction logic in av_parse_ratio()

Avoid to divide num and den by gcd in case of a parsed expression, since
that is already done in av_d2q(), and force reduction in case of "a:b"
form, allowing to honour the max parameter.

The latter change is consistent with the a/b case, and with the
documentation.

6 years agoexamples/scaling_video: remove unnecessary intermediary variable in fill_yuv_frame()
Stefano Sabatini [Sat, 20 Oct 2012 09:53:22 +0000 (11:53 +0200)]
examples/scaling_video: remove unnecessary intermediary variable in fill_yuv_frame()

6 years agolavc/utils: fix a few case/punctuation inconsistencies in avcodec_open2()
Stefano Sabatini [Tue, 16 Oct 2012 11:26:51 +0000 (13:26 +0200)]
lavc/utils: fix a few case/punctuation inconsistencies in avcodec_open2()

6 years agolavc/utils: extend feedback provided by avcodec_open2()
Stefano Sabatini [Mon, 15 Oct 2012 13:21:00 +0000 (15:21 +0200)]
lavc/utils: extend feedback provided by avcodec_open2()

6 years agoexamples/decoding_encoding: fix misc typos in the usage text
Stefano Sabatini [Sat, 20 Oct 2012 09:28:07 +0000 (11:28 +0200)]
examples/decoding_encoding: fix misc typos in the usage text

6 years agoexamples/decoding_encoding: remove misplaced and confusing comment
Stefano Sabatini [Sat, 20 Oct 2012 09:00:17 +0000 (11:00 +0200)]
examples/decoding_encoding: remove misplaced and confusing comment

6 years agoexamples/decoding_encoding: add missing checks on avcodec_alloc_context3()
Stefano Sabatini [Sat, 20 Oct 2012 08:59:02 +0000 (10:59 +0200)]
examples/decoding_encoding: add missing checks on avcodec_alloc_context3()

6 years agoconfigure: Group math functions into a separate variable
Diego Biurrun [Fri, 19 Oct 2012 16:58:39 +0000 (18:58 +0200)]
configure: Group math functions into a separate variable

This avoids some duplication when listing and testing for the functions.

6 years agoavutil/mem: K&R formatting cosmetics
Diego Biurrun [Thu, 18 Oct 2012 17:16:37 +0000 (19:16 +0200)]
avutil/mem: K&R formatting cosmetics

6 years agoavutil/lzo: K&R formatting cosmetics
Diego Biurrun [Thu, 18 Oct 2012 17:15:43 +0000 (19:15 +0200)]
avutil/lzo: K&R formatting cosmetics

6 years agofate-vc1: add dependencies
Mans Rullgard [Thu, 18 Oct 2012 02:18:39 +0000 (03:18 +0100)]
fate-vc1: add dependencies

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoARM: fix overreads in neon h264 chroma mc
Mans Rullgard [Fri, 19 Oct 2012 12:39:11 +0000 (13:39 +0100)]
ARM: fix overreads in neon h264 chroma mc

The loops were reading ahead one line, which could end up outside the
buffer for reference blocks at the edge of the picture.  Removing
this readahead has no measurable performance impact.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoswresample: include ff_log2_tab for shared builds
Hendrik Leppkes [Fri, 19 Oct 2012 19:35:40 +0000 (21:35 +0200)]
swresample: include ff_log2_tab for shared builds

This is done in accordance with all other libraries, which no longer access ff_log2_tab from avutil directly for shared builds, and instead obtain their own copy.

This change is required for MSVC DLL builds, as well as avoids accessing a private symbol from another library.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMark data symbols shared between libraries with av_export
Hendrik Leppkes [Fri, 19 Oct 2012 19:35:39 +0000 (21:35 +0200)]
Mark data symbols shared between libraries with av_export

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet
Martin Storsjö [Wed, 17 Oct 2012 13:46:29 +0000 (16:46 +0300)]
rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1: only disable interlaced b-frames for software decoding
Hendrik Leppkes [Sun, 23 Sep 2012 11:52:52 +0000 (13:52 +0200)]
vc1: only disable interlaced b-frames for software decoding

Tested-by: Gwenole Beauchesne <gb.devel@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1: implement vc1 field interlaced dxva2 decoding
Hendrik Leppkes [Fri, 13 Jan 2012 21:13:51 +0000 (22:13 +0100)]
vc1: implement vc1 field interlaced dxva2 decoding

Tested-by: Gwenole Beauchesne <gb.devel@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohlsproto: fix integer overflow
Michael Niedermayer [Fri, 19 Oct 2012 21:24:03 +0000 (23:24 +0200)]
hlsproto: fix integer overflow

Fixes CID703743
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogxfenc: fix null ptr dereference
Michael Niedermayer [Fri, 19 Oct 2012 21:21:41 +0000 (23:21 +0200)]
gxfenc: fix null ptr dereference

Fixes CID703677
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohls: fix integer overflow
Michael Niedermayer [Fri, 19 Oct 2012 21:00:47 +0000 (23:00 +0200)]
hls: fix integer overflow

Fixes CID717892
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavio: fix sizeof argument
Michael Niedermayer [Fri, 19 Oct 2012 20:35:32 +0000 (22:35 +0200)]
avio: fix sizeof argument

Fixes CID732284
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogitignore: ignore files created by msvc
Hendrik Leppkes [Fri, 19 Oct 2012 20:07:10 +0000 (22:07 +0200)]
gitignore: ignore files created by msvc

exp files are created in every build and contain export information
of the libraries. Both pdb and ilk are created during debug builds,
and contain linking and debug information used by MSVC.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agourl_alloc_for_protocol: fix use of uninitialized variable
Michael Niedermayer [Fri, 19 Oct 2012 20:14:13 +0000 (22:14 +0200)]
url_alloc_for_protocol: fix use of uninitialized variable

Fixes CID703830
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavidec: remove unneeded null check
Michael Niedermayer [Fri, 19 Oct 2012 19:46:39 +0000 (21:46 +0200)]
avidec: remove unneeded null check

Fixes CID29555
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_mp: fix null ptr deref in case of ENOMEM
Michael Niedermayer [Fri, 19 Oct 2012 17:55:01 +0000 (19:55 +0200)]
vf_mp: fix null ptr deref in case of ENOMEM

Fixes CID703675
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_mp: check list in querry_format()
Michael Niedermayer [Fri, 19 Oct 2012 17:51:33 +0000 (19:51 +0200)]
vf_mp: check list in querry_format()

Fixes CID717772
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_idet: reorder operations to avoid division by 0
Michael Niedermayer [Fri, 19 Oct 2012 17:35:31 +0000 (19:35 +0200)]
vf_idet: reorder operations to avoid division by 0

Fixes CID733738
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: Add proper dependencies for the tests in video.mak
Martin Storsjö [Thu, 18 Oct 2012 22:40:47 +0000 (01:40 +0300)]
fate: Add proper dependencies for the tests in video.mak

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoutvideoenc: fix theoretical integer overflow
Michael Niedermayer [Fri, 19 Oct 2012 16:44:28 +0000 (18:44 +0200)]
utvideoenc: fix theoretical integer overflow

The image sizes needed for this overflow to happen are currently not
supported in lavc, thus this should have no effect execpt making the
code more robust in light of future changes.

Fixes CID732245
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec_align_dimensions2: add missing breaks
Michael Niedermayer [Fri, 19 Oct 2012 16:38:53 +0000 (18:38 +0200)]
avcodec_align_dimensions2: add missing breaks

This should have just cosmetic effects

Fixes CID603265
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: enable recursively using avcodec_open2/close.
Ash Hughes [Fri, 19 Oct 2012 01:12:56 +0000 (01:12 +0000)]
lavc: enable recursively using avcodec_open2/close.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Disable Snow decoder and encoder by default
Diego Biurrun [Mon, 15 Oct 2012 21:56:38 +0000 (23:56 +0200)]
configure: Disable Snow decoder and encoder by default

Snow has serious unfixed bugs and no real-world use.

6 years agolzo: Drop obsolete fast_memcpy reference
Diego Biurrun [Thu, 18 Oct 2012 14:53:42 +0000 (16:53 +0200)]
lzo: Drop obsolete fast_memcpy reference

6 years agobuild: Drop OBJS declaration for non-existing PCM_DVD encoder
Diego Biurrun [Fri, 19 Oct 2012 14:16:06 +0000 (16:16 +0200)]
build: Drop OBJS declaration for non-existing PCM_DVD encoder

6 years agomov.c: Check for stsd + m1s tag indicating MOV-wrapped MPEG-PS, and force continued...
Petter Ericson [Wed, 17 Oct 2012 14:53:19 +0000 (16:53 +0200)]
mov.c: Check for stsd + m1s tag indicating MOV-wrapped MPEG-PS, and force continued probing if found.

Fixes Ticket241
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg4videodec: Disable frame multithreading for GMC, its not implemented at all
Michael Niedermayer [Fri, 12 Oct 2012 20:38:54 +0000 (22:38 +0200)]
mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agofate: Handle lavf-fate tests in a makefile
jamal [Fri, 19 Oct 2012 05:22:12 +0000 (02:22 -0300)]
fate: Handle lavf-fate tests in a makefile

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 19 Oct 2012 12:15:47 +0000 (14:15 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Add proper dependencies in qt.mak
  fate: Add proper dependencies in lossless-video.mak
  indeo3: do not try to output more lines than we can fit
  bmv: get a new frame on every decode_frame(), so we can use direct rendering

Conflicts:
libavcodec/bmv.c
tests/fate/lossless-video.mak
tests/fate/qt.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'
Michael Niedermayer [Fri, 19 Oct 2012 11:58:14 +0000 (13:58 +0200)]
Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'

* commit '1cd432e167b1a80853760c89a33606e2b5f229c2':
  configure: fix libcdio check
  rtsp: Allow setting the reordering buffer size via an AVOption
  rtsp: Vertically align a constant definition
  rtp: Update the check for distinguishing between RTP and RTCP
  aac: fix build with hardcoded tables
  fate: dependencies for screen codec tests
  riff: Move functions around to be covered by appropriate #ifdefs

Conflicts:
configure
tests/fate/screen.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'
Michael Niedermayer [Fri, 19 Oct 2012 11:47:47 +0000 (13:47 +0200)]
Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'

* commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95':
  avformat: Fix references to the removed function av_write_header in comments
  changelog: Mention the MSVC DLL support
  fate: add dependencies for misc microsoft codecs
  fate-twinvq: add dependencies
  fate-mpc: add dependencies
  fate-indeo: add dependencies
  fate-als: add dependencies
  fate: dependencies for demux tests

Conflicts:
Changelog
tests/Makefile
tests/fate/demux.mak
tests/fate/microsoft.mak
tests/fate/mpc.mak
tests/fate/vqf.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'
Michael Niedermayer [Fri, 19 Oct 2012 11:29:24 +0000 (13:29 +0200)]
Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'

* commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72':
  fate: add a dependency helper macro
  Add support for building shared libraries with MSVC
  avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab
  gxf: Add a local copy of the relevant parts of the frame rate table
  configure: Split out msvc as a separate target OS
  aviobuf: Remove a senseless ifdef in avio_seek

Conflicts:
configure
libavcodec/dirac.c
libavcodec/mpeg12data.h
libavcodec/mpeg12enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: Add proper dependencies in qt.mak
Martin Storsjö [Thu, 18 Oct 2012 22:49:15 +0000 (01:49 +0300)]
fate: Add proper dependencies in qt.mak

The output of make fate-list is identical to before.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agofate: Add proper dependencies in lossless-video.mak
Martin Storsjö [Thu, 18 Oct 2012 21:35:32 +0000 (00:35 +0300)]
fate: Add proper dependencies in lossless-video.mak

The output of make fate-list is identical to before.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoindeo3: do not try to output more lines than we can fit
Kostya Shishkov [Thu, 18 Oct 2012 09:45:42 +0000 (11:45 +0200)]
indeo3: do not try to output more lines than we can fit

Internally chroma planes have multiple of four height while allocated image
planes might be smaller if CODEC_FLAG_EMU_EDGE is set. Thus we should not
output more lines of chroma than frame can accept.

Also the decoder can be safely switched to direct rendering now.

6 years agobmv: get a new frame on every decode_frame(), so we can use direct rendering
Kostya Shishkov [Thu, 18 Oct 2012 09:08:01 +0000 (11:08 +0200)]
bmv: get a new frame on every decode_frame(), so we can use direct rendering

6 years agotiffenc: fix integer overflow
Michael Niedermayer [Fri, 19 Oct 2012 01:36:42 +0000 (03:36 +0200)]
tiffenc: fix integer overflow

Fixes CID700699
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoroqvideodec: replace dead code by assert
Michael Niedermayer [Fri, 19 Oct 2012 01:15:06 +0000 (03:15 +0200)]
roqvideodec: replace dead code by assert

Fixes CID732195
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoroqaudioenc: Fix crash with very small roq files
Michael Niedermayer [Fri, 19 Oct 2012 00:53:06 +0000 (02:53 +0200)]
roqaudioenc: Fix crash with very small roq files

Fixes CID703669
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/tta: do not overwrite bits_per_coded_sample
Paul B Mahol [Wed, 17 Oct 2012 08:27:54 +0000 (08:27 +0000)]
lavc/tta: do not overwrite bits_per_coded_sample

It is supposed to be set in libavformat only.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agokmvc: use meaningful error codes
Paul B Mahol [Wed, 17 Oct 2012 15:42:24 +0000 (15:42 +0000)]
kmvc: use meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoxxan: return more meaningful error codes
Paul B Mahol [Wed, 17 Oct 2012 14:45:00 +0000 (14:45 +0000)]
xxan: return more meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavc/yop: remove redudant YOP in av_log() messages
Paul B Mahol [Wed, 17 Oct 2012 14:32:14 +0000 (14:32 +0000)]
lavc/yop: remove redudant YOP in av_log() messages

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agojvdec: use more meaningful error code
Paul B Mahol [Wed, 17 Oct 2012 14:27:13 +0000 (14:27 +0000)]
jvdec: use more meaningful error code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoidcinvideo: if decoding fails return error
Paul B Mahol [Wed, 17 Oct 2012 14:04:12 +0000 (14:04 +0000)]
idcinvideo: if decoding fails return error

Previously if frame decoding failed it would be
silently reported as valid frame.

The fate ref is updated because sample have
truncated last video packet.

While here return meaningful error codes.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavc/c93: use meaningful error codes
Paul B Mahol [Wed, 17 Oct 2012 12:41:17 +0000 (12:41 +0000)]
lavc/c93: use meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoconfigure: fix libcdio check
Mans Rullgard [Thu, 18 Oct 2012 21:38:12 +0000 (22:38 +0100)]
configure: fix libcdio check

The compiler/linker flags passed to check_lib2 should not be quoted.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agomotionpixels/mp_decode_frame_helper: assert that the first pixel doesnt reuse the...
Michael Niedermayer [Thu, 18 Oct 2012 23:20:27 +0000 (01:20 +0200)]
motionpixels/mp_decode_frame_helper: assert that the first pixel doesnt reuse the last.

reusing the last would use uninitialized data, this should be
impossible currently, but better to check by assert.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomlp_parser: print error when ff_combine_frame() fails to add the current buffer
Michael Niedermayer [Thu, 18 Oct 2012 22:05:03 +0000 (00:05 +0200)]
mlp_parser: print error when ff_combine_frame() fails to add the current buffer

Fixes part of CID602338
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: add raw text subtitles decoder.
Clément Bœsch [Sun, 14 Oct 2012 01:08:30 +0000 (03:08 +0200)]
lavc: add raw text subtitles decoder.

6 years agortsp: Allow setting the reordering buffer size via an AVOption
Martin Storsjö [Wed, 17 Oct 2012 12:46:30 +0000 (15:46 +0300)]
rtsp: Allow setting the reordering buffer size via an AVOption

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortsp: Vertically align a constant definition
Martin Storsjö [Wed, 17 Oct 2012 12:24:46 +0000 (15:24 +0300)]
rtsp: Vertically align a constant definition

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortp: Update the check for distinguishing between RTP and RTCP
Martin Storsjö [Tue, 16 Oct 2012 22:45:39 +0000 (01:45 +0300)]
rtp: Update the check for distinguishing between RTP and RTCP

Also add enums for more RTCP packet types, according to the IANA
list of registered types.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoff_convert_matrix: fix integer overflow
Michael Niedermayer [Thu, 18 Oct 2012 19:51:04 +0000 (21:51 +0200)]
ff_convert_matrix: fix integer overflow

Fixes CID608053
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideoenc: check return value of ff_MPV_frame_start()
Michael Niedermayer [Thu, 18 Oct 2012 19:42:31 +0000 (21:42 +0200)]
mpegvideoenc: check return value of ff_MPV_frame_start()

Fixes CID703622
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolzwenc: change assert to av_assert
Michael Niedermayer [Thu, 18 Oct 2012 19:42:04 +0000 (21:42 +0200)]
lzwenc: change assert to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobmv: remove unreachable default case
Michael Niedermayer [Thu, 18 Oct 2012 18:49:20 +0000 (20:49 +0200)]
bmv: remove unreachable default case

Fixes CID732191
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaac: fix build with hardcoded tables
Mans Rullgard [Thu, 18 Oct 2012 14:32:11 +0000 (15:32 +0100)]
aac: fix build with hardcoded tables

aac_tablegen.h includes aac.h for the POW_SF2_ZERO definition, but
this also pulls in a raft of other headers, some of which are not
safe to use in code built with the host compiler.

Moving POW_SF2_ZERO to aac_tablegen_decl.h, where the declaration
of the array it relates to already resides, fixes the problems.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoindeo4: prevent printing uninitialized variable
Michael Niedermayer [Thu, 18 Oct 2012 18:41:51 +0000 (20:41 +0200)]
indeo4: prevent printing uninitialized variable

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