ffmpeg.git
7 years agolavf/segment: increase logging level for message with segment start information
Stefano Sabatini [Tue, 17 Dec 2013 09:43:32 +0000 (10:43 +0100)]
lavf/segment: increase logging level for message with segment start information

Help debugging.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 18 Dec 2013 11:37:42 +0000 (12:37 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  png_parser: Fix parsing on big endian

See: 3d42addf336739a69aee47891413a46e4f64995b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'd8fd183683b7495566b7e510a6536ae2efe8dfed'
Michael Niedermayer [Wed, 18 Dec 2013 11:23:41 +0000 (12:23 +0100)]
Merge commit 'd8fd183683b7495566b7e510a6536ae2efe8dfed'

* commit 'd8fd183683b7495566b7e510a6536ae2efe8dfed':
  vc1: Fix mb_height for field pictures

See: 017e234c204f8ffb5f85a073231247881be1ac6f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopng_parser: Fix parsing on big endian
Martin Storsjö [Wed, 18 Dec 2013 08:39:47 +0000 (10:39 +0200)]
png_parser: Fix parsing on big endian

Since pc.state is populated by shifting in from the end of the
32 bit word, the content within pc.state is already in native endian
and should not be read with the AV_R{L,B} functions.

This was already done correctly for state64 above.

This fixes the fate-corepng test on big endian.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavcodec/aacdec: default to non-wide 7.1 in non-strict mode
Anssi Hannula [Tue, 17 Dec 2013 21:04:31 +0000 (23:04 +0200)]
avcodec/aacdec: default to non-wide 7.1 in non-strict mode

AAC specification has 7.1(wide) as a default layout for 8-channel
streams (channel config 7). However, at least Nero AAC encoder encodes
non-wide 7.1 streams using the default channel config 7, mapping the
side channels of the original audio stream to the second
AAC_CHANNEL_FRONT pair in the AAC stream. Similarly, e.g. FAAD decodes
the second AAC_CHANNEL_FRONT pair as side channels, therefore decoding
the incorrect streams as if they were correct (and as the encoder
intended).

FFmpeg currently decodes such files by-the-spec, i.e. after decoding the
original front pair will be in AV_CH_FRONT_x_OF_CENTER and the original
side pair will be in AV_CH_FRONT_x.

As actual intended 7.1(wide) streams are very rare while misencoded 7.1
files actually exist in the wild, default to assuming a 7.1 layout was
intended unless in strict mode.

Fixes playback of e.g. 8_Channel_ID.m4a in samples.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRevert "Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'" (Bump libavutil...
Michael Niedermayer [Mon, 16 Dec 2013 22:24:52 +0000 (23:24 +0100)]
Revert "Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'" (Bump libavutil major version to account for the LLS API/ABI changes.)

This reverts commit 792845e436ddc5f3ce11ba02535a3372919061f2, reversing
changes made to 1d6666a6b828cca6c6b355a9b62f25607b1ced08.

Bumping libavutil requires all libraries that use libavutil to have their
major version bumped (yes breakage has been confirmed this is not a hypotheses)

One case of breakage is due to new types being added to AVOptions and
applications that linked to old libavutil and libswresample
then trying to use old libavutil (its soname changed so the old isnt updated)
and new swresample (its soame didnt change so it is updated)
the new swresample contains AVOption types that the old libavutil doesnt
know of thus the application attempting to access these avoptions
fails

AVOptions are used by all libs so the issue can potentially happen with
any other lib, libswresample was just the first that showed the problem
ive not checked if the other libs are affected currently by the same issue
or not

Also in addition to AVOptions, AVFrames are also defined in
libavutil, bumping it without all libs that use AVFrames could lead to
serious inconsistencies when 2 libs/app end up using 2 different libavutils

The alternative of bumping all is still possible after this revert, if it
turns out to be the preferred solution

7 years agoavcodec/vc1dec: use av_mallocz for luma_mv
Michael Niedermayer [Tue, 17 Dec 2013 20:53:07 +0000 (21:53 +0100)]
avcodec/vc1dec: use av_mallocz for luma_mv

This ensures that no mvs are uninitialized at the time of loop filtering
Fixes: msan_uninit-mem_7f0b6dfe293c_2786_SA20021.vc1
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1: Fix mb_height for field pictures
Michael Niedermayer [Sat, 14 Dec 2013 13:52:31 +0000 (14:52 +0100)]
vc1: Fix mb_height for field pictures

Tables are always allocated now with sufficient space for either progressive
or interlaced content. The alternative would be to detect a change
and reallocate.

This fixes decoding of a sample.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 17 Dec 2013 18:37:33 +0000 (19:37 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  apidoc: fix warning from stereo3d.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3d9fc21e593aa89b5877bd739268499b079052f2'
Michael Niedermayer [Tue, 17 Dec 2013 18:30:57 +0000 (19:30 +0100)]
Merge commit '3d9fc21e593aa89b5877bd739268499b079052f2'

* commit '3d9fc21e593aa89b5877bd739268499b079052f2':
  h264: Refactor decode_frame_packing_arrangement

Conflicts:
libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3a149e23d37f06d49ab0bb013a3b9cb0224bba5c'
Michael Niedermayer [Tue, 17 Dec 2013 18:04:32 +0000 (19:04 +0100)]
Merge commit '3a149e23d37f06d49ab0bb013a3b9cb0224bba5c'

* commit '3a149e23d37f06d49ab0bb013a3b9cb0224bba5c':
  hevc: Refactor decode_nal_sei_frame_packing_arrangement

Conflicts:
libavcodec/hevc_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'cfb4ee30977732674d30c20e93a761c33c743972'
Michael Niedermayer [Tue, 17 Dec 2013 17:16:26 +0000 (18:16 +0100)]
Merge commit 'cfb4ee30977732674d30c20e93a761c33c743972'

* commit 'cfb4ee30977732674d30c20e93a761c33c743972':
  fate: add a pngparser test

Conflicts:
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'eddff165b4cdc1f064245a4bad6f4265581c12b1'
Michael Niedermayer [Tue, 17 Dec 2013 17:08:37 +0000 (18:08 +0100)]
Merge commit 'eddff165b4cdc1f064245a4bad6f4265581c12b1'

* commit 'eddff165b4cdc1f064245a4bad6f4265581c12b1':
  fate: add utility function to test parser, demuxer, and decoder

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c'
Michael Niedermayer [Tue, 17 Dec 2013 16:58:06 +0000 (17:58 +0100)]
Merge commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c'

* commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c':
  png: add a standalone parser

Conflicts:
Changelog
libavcodec/png_parser.c
libavcodec/version.h

See: 2ee6dca3b8f40132be5c8b77e3700a9e3f26c382
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/utils: drop 2 dependancies on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/utils: drop 2 dependancies on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/libvorbisenc: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/libvorbisenc: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffprobe: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
ffprobe: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/flashsv2enc: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/flashsv2enc: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/j2kenc: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/j2kenc: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/libopenjpegenc: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/libopenjpegenc: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/mjpegenc: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/mjpegenc: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/msvideo1enc: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/msvideo1enc: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/diracdec: avoid depending on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 14:30:20 +0000 (15:30 +0100)]
avcodec/diracdec: avoid depending on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/svq3: set last/next frames to defaults before use
Michael Niedermayer [Tue, 17 Dec 2013 13:54:29 +0000 (14:54 +0100)]
avcodec/svq3: set last/next frames to defaults before use

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/utils: implement avcodec_alloc_frame() through av_alloc_frame()
Michael Niedermayer [Tue, 17 Dec 2013 13:03:38 +0000 (14:03 +0100)]
avcodec/utils: implement avcodec_alloc_frame() through av_alloc_frame()

This ensures that theres just one AVFrame allocation function and libs dont
produce multiple AVFrame variants after a minor lib update

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec: use av_frame_unref() to set frame defaults
Michael Niedermayer [Tue, 17 Dec 2013 13:02:29 +0000 (14:02 +0100)]
avcodec: use av_frame_unref() to set frame defaults

This ensures that the code isnt duplicated and cant become out of sync

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoapidoc: fix warning from stereo3d.h
Vittorio Giovara [Mon, 16 Dec 2013 13:40:06 +0000 (14:40 +0100)]
apidoc: fix warning from stereo3d.h

7 years agoh264: Refactor decode_frame_packing_arrangement
Vittorio Giovara [Fri, 13 Dec 2013 17:12:59 +0000 (18:12 +0100)]
h264: Refactor decode_frame_packing_arrangement

Directly set the fields when necessary.

7 years agohevc: Refactor decode_nal_sei_frame_packing_arrangement
Luca Barbato [Fri, 13 Dec 2013 15:39:45 +0000 (15:39 +0000)]
hevc: Refactor decode_nal_sei_frame_packing_arrangement

Directly set the fields when necessary.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
7 years agofate: add a pngparser test
Vittorio Giovara [Wed, 11 Dec 2013 09:40:13 +0000 (10:40 +0100)]
fate: add a pngparser test

7 years agofate: add utility function to test parser, demuxer, and decoder
Vittorio Giovara [Thu, 12 Dec 2013 15:08:31 +0000 (16:08 +0100)]
fate: add utility function to test parser, demuxer, and decoder

7 years agopng: add a standalone parser
Peter Holik [Thu, 12 Dec 2013 15:11:35 +0000 (16:11 +0100)]
png: add a standalone parser

Useful for reading png images from a pipe.

7 years agoavcodec/gifdec: check that the correct number of bytes was decoded
Michael Niedermayer [Tue, 17 Dec 2013 01:32:19 +0000 (02:32 +0100)]
avcodec/gifdec: check that the correct number of bytes was decoded

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f084c646637_9261_top_title_green_frog.gif
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoUDP: join multicast group on the interface specified with &localaddr=
Stoian Ivanov [Fri, 13 Dec 2013 10:49:34 +0000 (12:49 +0200)]
UDP: join multicast group on the interface specified with &localaddr=

When joining multicast groups, ffmpeg was using INADDR_ANY as interface address
which leads to enabling the multicast group on the interface with "default gateway".
Often multicast traffic is received over dedicated interface, which scenario ffmpeg was
unable to handle. With this patch, ffmpeg will enable multicast group to the interfaces
configured with address specified in &localaddr= parameter of udp:// URL. To avoid
loacal_addr resolve at udp_close(...) the UDPContext structure was extended with
struct sockaddr_storage local_addr_storage member, which is populated in udp_open(..)
and passed to udp_join_multicast_group()  and udp_leave_multicast_group().

Signed-off-by: Stoian Ivanov <s.ivanov@teracomm.bg>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/format: av_register_output_format() and av_register_intput_format() that...
Michael Niedermayer [Sun, 8 Dec 2013 01:29:28 +0000 (02:29 +0100)]
avformat/format: av_register_output_format() and av_register_intput_format() that work in O(1) time

Reviewed-by: Stefano Sabatini
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/utils: av_register_codec & hwaccel() that work in O(1) time
Michael Niedermayer [Sun, 8 Dec 2013 02:19:12 +0000 (03:19 +0100)]
avcodec/utils: av_register_codec & hwaccel() that work in O(1) time

Its possible to implement this with a few lines less code but it then
would flip the order of the list and require registration of external
codecs to be done first, also it could break user applications due to
this. Thus to maintain ABI this slighty more complex solution is
used.

Reviewed-by: Stefano Sabatini
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 16 Dec 2013 23:14:50 +0000 (00:14 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: Remove deprecated intfloat_readwrite code

Conflicts:
libavutil/intfloat_readwrite.c
libavutil/intfloat_readwrite.h

The files are left in place as they are still used by some projects
mplayer is one.
Theres no hurry in removing the code, it can as well be removed once
no projects use it anymore

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '11bb5e10c36539bcc303ceaac6f88d9ecb66e07f'
Michael Niedermayer [Mon, 16 Dec 2013 22:57:23 +0000 (23:57 +0100)]
Merge commit '11bb5e10c36539bcc303ceaac6f88d9ecb66e07f'

* commit '11bb5e10c36539bcc303ceaac6f88d9ecb66e07f':
  build: Define __printf__ to __gnu_printf__ on MinGW*/gcc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d'
Michael Niedermayer [Mon, 16 Dec 2013 21:07:24 +0000 (22:07 +0100)]
Merge commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d'

* commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d':
  Bump major of libavfilter for reference counted buffer API changes.

Conflicts:
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'
Michael Niedermayer [Mon, 16 Dec 2013 20:36:14 +0000 (21:36 +0100)]
Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'

* commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c':
  Bump libavutil major version to account for the LLS API/ABI changes.

Conflicts:
libavutil/version.h

Bump done to stay compatible with libav, its not neccessary otherwise for ffmpeg
as we have the new ABI/API under LLS2 and the old (unused) under LLS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffserver: extend report_config_error() facilities, and use it for warnings
Stefano Sabatini [Fri, 29 Nov 2013 07:54:50 +0000 (08:54 +0100)]
ffserver: extend report_config_error() facilities, and use it for warnings

7 years agoffserver: add stream Metadata option
Stefano Sabatini [Fri, 29 Nov 2013 07:41:24 +0000 (08:41 +0100)]
ffserver: add stream Metadata option

Also deprecate Author, Comment, Copyright, and Title options, and update
docs to use the new Metadata option.

7 years agoffserver: fix spacing typoin error message
Stefano Sabatini [Sun, 15 Dec 2013 22:12:30 +0000 (23:12 +0100)]
ffserver: fix spacing typoin error message

7 years agolavu/dict.h: extend/clarify av_dict_get() doxy
Stefano Sabatini [Sun, 15 Dec 2013 22:12:38 +0000 (23:12 +0100)]
lavu/dict.h: extend/clarify av_dict_get() doxy

7 years agolavfi/buffersrc: set min and max values for pix_fmt option
Stefano Sabatini [Mon, 16 Dec 2013 14:58:58 +0000 (15:58 +0100)]
lavfi/buffersrc: set min and max values for pix_fmt option

Currently the min and max values are not honored, but this will change in
a following patch.

7 years agoavutil: Remove deprecated intfloat_readwrite code
Diego Biurrun [Mon, 16 Dec 2013 14:25:05 +0000 (15:25 +0100)]
avutil: Remove deprecated intfloat_readwrite code

It was deprecated over two years ago.

7 years agoavcodec/libx264: Set colorspace details correctly
Torsten Jager [Mon, 16 Dec 2013 15:59:02 +0000 (16:59 +0100)]
avcodec/libx264: Set colorspace details correctly

After adding colorspace support to xine-lib, I insist in proper
settings within media files at least when they do not follow
that implicit SD/HD routine.

7 years agobuild: Define __printf__ to __gnu_printf__ on MinGW*/gcc
Diego Biurrun [Fri, 13 Dec 2013 22:19:55 +0000 (23:19 +0100)]
build: Define __printf__ to __gnu_printf__ on MinGW*/gcc

This is necessary to avoid GCC assuming MS style printf arguments.

7 years agoavcodec/mlpdec: check that streamtype matches the codec
Michael Niedermayer [Mon, 16 Dec 2013 14:03:39 +0000 (15:03 +0100)]
avcodec/mlpdec: check that streamtype matches the codec

Fixes use of uninitialized memory
Fixes msan_uninit-mem_7f126c8ed1ac_5945_issue1731_nonpublic.mpg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/wmalosslessdec: completely initialize contains_subframe
Michael Niedermayer [Mon, 16 Dec 2013 11:48:56 +0000 (12:48 +0100)]
avcodec/wmalosslessdec: completely initialize contains_subframe

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f60c46325d7_6415_luckynight.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/psxstr: zero packet to prevent uninitialized data to leak through to the...
Michael Niedermayer [Mon, 16 Dec 2013 03:31:52 +0000 (04:31 +0100)]
avformat/psxstr: zero packet to prevent uninitialized data to leak through to the decoder

Fixes: msan_uninit-mem_7f150abf2e84_4817_descent-partial.str
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale/x86/rgb2rgb_template: try to fix build failure with avx disabled
Michael Niedermayer [Mon, 16 Dec 2013 02:38:13 +0000 (03:38 +0100)]
swscale/x86/rgb2rgb_template: try to fix build failure with avx disabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/mpeg12dec: Don't create side data when current picture ptr is NULL.
Tomer Barletz [Sun, 15 Dec 2013 08:18:05 +0000 (00:18 -0800)]
avcodec/mpeg12dec: Don't create side data when current picture ptr is NULL.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: (vp9) ensure bitstream compatibility
James Zern [Mon, 16 Dec 2013 00:53:34 +0000 (16:53 -0800)]
configure: (vp9) ensure bitstream compatibility

avoids picking up a library that could produce invalid bitstreams and
fixes build issues with the same.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: NEON optimized unscaled rgba to nv12 conversion
Yu Xiaolei [Sat, 14 Dec 2013 07:31:42 +0000 (15:31 +0800)]
swscale: NEON optimized unscaled rgba to nv12 conversion

Signed-off-by: Yu Xiaolei <dreifachstein@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/id3v2: Check avio_read() return value in read_chapter()
Michael Niedermayer [Sun, 15 Dec 2013 19:57:19 +0000 (20:57 +0100)]
avformat/id3v2: Check avio_read() return value in read_chapter()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/id3v2: factor free code to the end of read_chapter()
Michael Niedermayer [Sun, 15 Dec 2013 19:56:34 +0000 (20:56 +0100)]
avformat/id3v2: factor free code to the end of read_chapter()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegts: stop analyzing when pmt for all programs have been found
Joakim Plate [Sun, 15 Dec 2013 14:58:31 +0000 (15:58 +0100)]
mpegts: stop analyzing when pmt for all programs have been found

This disables NOHEADER after finding PMT for all programs to
avoid find_stream_info always exhausting probe size for mpegts.

This is very important for live streams since read speed
will be limited. rtsp, udp and any protocol streaming a live
mpegts will have dramatically faster startup time.

Note, lack of codec parameters for streams can still cause
the full probe size to be exhausted.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/utils: limit rfps to values larger than fps
Michael Niedermayer [Sun, 15 Dec 2013 20:40:13 +0000 (21:40 +0100)]
avformat/utils: limit rfps to values larger than fps

This avoids some nonsense values being produced by totally corrupted input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovformat/id3v2: check avio_read for short reads in addition to errors
Michael Niedermayer [Sun, 15 Dec 2013 19:12:48 +0000 (20:12 +0100)]
vformat/id3v2: check avio_read for short reads in addition to errors

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexamples/decoding_encoding: check av_samples_get_buffer_size() for a negative value
Stefano Sabatini [Sun, 15 Dec 2013 19:09:26 +0000 (20:09 +0100)]
examples/decoding_encoding: check av_samples_get_buffer_size() for a negative value

Fix broken != 0 check.

7 years agodoc/muxers/tee: add example showing second level escaping
Stefano Sabatini [Sun, 15 Dec 2013 17:32:51 +0000 (18:32 +0100)]
doc/muxers/tee: add example showing second level escaping

7 years agodoc/muxers/tee: use @ref to reference other sections
Stefano Sabatini [Sun, 15 Dec 2013 17:29:01 +0000 (18:29 +0100)]
doc/muxers/tee: use @ref to reference other sections

7 years agolavf/mux: improve feedback in case of no streams in muxer
Stefano Sabatini [Sun, 15 Dec 2013 17:12:10 +0000 (18:12 +0100)]
lavf/mux: improve feedback in case of no streams in muxer

7 years agoavformat/oggparsetheora: zero extradata padding area
Michael Niedermayer [Sun, 15 Dec 2013 18:21:02 +0000 (19:21 +0100)]
avformat/oggparsetheora: zero extradata padding area

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f66fa0ac09d_9197_theora_a4_v6_k250_s0.ogg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/bink: use av_mallocz for data
Michael Niedermayer [Sun, 15 Dec 2013 15:52:37 +0000 (16:52 +0100)]
avcodec/bink: use av_mallocz for data

Fixes use of uninitialized memory
Fixes msan_uninit-mem_7fe8a5fd759d_2838_SPECTRE.BIK
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/id3v2: Check avio_read() return code in id3v2_parse()
Michael Niedermayer [Sun, 15 Dec 2013 14:42:53 +0000 (15:42 +0100)]
avformat/id3v2: Check avio_read() return code in id3v2_parse()

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f5a04a9b50d_7087_mp3__mp3__tooSmallFinal.mp3
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale/utils: check chroma width for fast bilinear scaler
Michael Niedermayer [Sun, 15 Dec 2013 13:13:55 +0000 (14:13 +0100)]
swscale/utils: check chroma width for fast bilinear scaler

Fixes artifacts where fast bilinear was used for downscaling chroma

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale/utils: remove useless ()
Michael Niedermayer [Sun, 15 Dec 2013 13:10:02 +0000 (14:10 +0100)]
swscale/utils: remove useless ()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale/utils: factor (d + 1 < 4) out
Michael Niedermayer [Sun, 15 Dec 2013 12:49:20 +0000 (13:49 +0100)]
swscale/utils: factor (d + 1 < 4) out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/msmpeg4dec: initialize dir_ptr in error cases
Michael Niedermayer [Sun, 15 Dec 2013 12:22:57 +0000 (13:22 +0100)]
avcodec/msmpeg4dec: initialize dir_ptr in error cases

Fixes use of uinitialized memory
Fixes: msan_uninit-mem_7f01b8799186_7278_msnaudio.asf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/msmpeg4dec: print error in case of invalid vlc in msmpeg4_decode_dc for versi...
Michael Niedermayer [Sun, 15 Dec 2013 12:22:03 +0000 (13:22 +0100)]
avcodec/msmpeg4dec: print error in case of invalid vlc in msmpeg4_decode_dc for version <=2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: update after 5f6c21117f23a3c825777cdb0565a21c5a468d35
Michael Niedermayer [Sun, 15 Dec 2013 11:21:49 +0000 (12:21 +0100)]
fate: update after 5f6c21117f23a3c825777cdb0565a21c5a468d35

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffprobe: show best_effort_timestamp in the frame section
wm4 [Thu, 28 Nov 2013 10:24:34 +0000 (11:24 +0100)]
ffprobe: show best_effort_timestamp in the frame section

This is useful for debugging.

Reference and ffprobe.xsd changes done and tested by Stefano Sabatini.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agoEnable parser in FLV demuxer for H264 codec
Alex Sukhanov [Thu, 12 Dec 2013 23:10:10 +0000 (15:10 -0800)]
Enable parser in FLV demuxer for H264 codec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/utils: treat flv like mov with timestamp discarding
Michael Niedermayer [Sun, 15 Dec 2013 03:17:05 +0000 (04:17 +0100)]
avformat/utils: treat flv like mov with timestamp discarding

This prevents a regression when using an avparser with flv h264

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sun, 15 Dec 2013 02:27:06 +0000 (03:27 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  libzvbi-teletextdec: set bitmap teletext canvas dimensions
  libzvbi-teletextdec: add chopped top row size to y offset
  libzvbi-teletextdec: use defined constants for bitmap char width and height
  libzvbi-teletextdec: cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/iff: fix memleak of packet
Michael Niedermayer [Sun, 15 Dec 2013 00:32:48 +0000 (01:32 +0100)]
avformat/iff: fix memleak of packet

Fixes: msan_uninit-mem_7f65b9788da6_388_24.iff
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/iff: shrink packets to the initialized data
Michael Niedermayer [Sun, 15 Dec 2013 00:32:48 +0000 (01:32 +0100)]
avformat/iff: shrink packets to the initialized data

Fixes use of uninitialized data
Fixes: msan_uninit-mem_7f65b9788da6_388_24.iff
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/svq3: cleanup context in case init fails
Michael Niedermayer [Sat, 14 Dec 2013 23:36:29 +0000 (00:36 +0100)]
avcodec/svq3: cleanup context in case init fails

Fixes memleaks

Fixes: msan_uninit-mem_7ff57193e77e_2715_RAW512K_Stream_004.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/mov: Check avio_read() return code in mov_read_extradata() and shrink the...
Michael Niedermayer [Sat, 14 Dec 2013 22:59:39 +0000 (23:59 +0100)]
avformat/mov: Check avio_read() return code in mov_read_extradata() and shrink the extradata if needed / return an error

Fixes use of uninitialized data
Fixes: msan_uninit-mem_7ff57193e77e_2715_RAW512K_Stream_004.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 14 Dec 2013 21:38:57 +0000 (22:38 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec_h264: Check the return value of functions doing allocations

See: c5f15f40b9b25f033fd9e8dd1e12763913098c11
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '6451c8853a07ff2e28bda950fb5e83fcf88c5cf4'
Michael Niedermayer [Sat, 14 Dec 2013 21:24:03 +0000 (22:24 +0100)]
Merge commit '6451c8853a07ff2e28bda950fb5e83fcf88c5cf4'

* commit '6451c8853a07ff2e28bda950fb5e83fcf88c5cf4':
  sdp: Check theora colorspace before producing the configuration string

See: db8a53d86a71c948bd41dd12d1ff1d3351ec2746
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoBump major of libavfilter for reference counted buffer API changes.
Reinhard Tartler [Sat, 14 Dec 2013 21:31:03 +0000 (16:31 -0500)]
Bump major of libavfilter for reference counted buffer API changes.

Applications that have been linked against an older release of Libav and pick up
updated libraries experience segmentation faults because they pick up the new
libavfilter, which assumes AVFrames have been allocated by libavutil and thus
contain new reference-counting related fields. This will break for AVFrames that
have been allocated by old libavcodec.

All scheduled API changes are deferred to the next bump.

7 years agoBump libavutil major version to account for the LLS API/ABI changes.
Reinhard Tartler [Sat, 14 Dec 2013 21:30:25 +0000 (16:30 -0500)]
Bump libavutil major version to account for the LLS API/ABI changes.

Commit 41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2 changed the LLS API, which was
called from libavcodec. Thus using an old libavcodec with a new libavutil will
break.

All scheduled API changes are deferred to the next bump.

7 years agoMerge commit '797f2a791397210ec1b591b326658805c5dbf104'
Michael Niedermayer [Sat, 14 Dec 2013 21:15:10 +0000 (22:15 +0100)]
Merge commit '797f2a791397210ec1b591b326658805c5dbf104'

* commit '797f2a791397210ec1b591b326658805c5dbf104':
  hdsenc: Check the init_file() return code
  hdsenc: Fix an off by one error in an array size check
  hdsenc: Avoid integer overflow

Conflicts:
libavformat/hdsenc.c

See: 572965c9a6b8173d918dea392aadfee1d44d7f47
See: 3dbf9afe857d480993786bea0ede9dd9526776d2
See: 6722e564a82bac471d92b02550b5017c09b539ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5db4e88ecd32485341f6150c00f5ee5bfa74f62d'
Michael Niedermayer [Sat, 14 Dec 2013 21:07:26 +0000 (22:07 +0100)]
Merge commit '5db4e88ecd32485341f6150c00f5ee5bfa74f62d'

* commit '5db4e88ecd32485341f6150c00f5ee5bfa74f62d':
  configure: Detect Solaris libc in an OpenIndiana/illumos compatible way

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/ipmovie: Check OPCODE_CREATE_TIMER size
Michael Niedermayer [Sat, 14 Dec 2013 20:22:14 +0000 (21:22 +0100)]
avformat/ipmovie: Check OPCODE_CREATE_TIMER size

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f81e836ef8c_5930_ipmovie_interplayvideo_interplay_dpcm__bislogo.mve
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/bitstream_filters: remove mp3_header_decompress filter
Stefano Sabatini [Sat, 14 Dec 2013 20:47:51 +0000 (21:47 +0100)]
doc/bitstream_filters: remove mp3_header_decompress filter

It was removed in commit c6080d89009056530119ab794ad02e4d515c7754.

7 years agoChangelog: correct typo
Timothy Gu [Sat, 14 Dec 2013 20:39:47 +0000 (12:39 -0800)]
Changelog: correct typo

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
7 years agobuild fix: apetag.c depends on img2.c
Yu Xiaolei [Sat, 14 Dec 2013 07:47:39 +0000 (15:47 +0800)]
build fix: apetag.c depends on img2.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'rbultje/vp9-simd'
Michael Niedermayer [Sat, 14 Dec 2013 17:13:03 +0000 (18:13 +0100)]
Merge remote-tracking branch 'rbultje/vp9-simd'

* rbultje/vp9-simd:
  vp9/x86: idct_add_16x16_ssse3.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovp9/x86: idct_add_16x16_ssse3.
Ronald S. Bultje [Sat, 14 Dec 2013 13:09:18 +0000 (08:09 -0500)]
vp9/x86: idct_add_16x16_ssse3.

Currently only dc-only and full 16x16. Other subforms will follow in the
near future. Total decoding time of ped1080p.webm goes from 9.7 to 9.3
seconds. DC-only goes from 957 -> 131 cycles, and the full IDCT goes
from ~4050 to ~745 cycles.

7 years agoavcodec/vc1: fix DIFF2/NORM2 with width<=16
Michael Niedermayer [Sat, 14 Dec 2013 16:55:25 +0000 (17:55 +0100)]
avcodec/vc1: fix DIFF2/NORM2 with width<=16

Fixes read of uninitialized memory
Fixes msan_uninit-mem_7f785da000e8_585_480i30__codec_WVC1__mode_2__framerate_29.970__type_2__preproc_17.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/vc1dec: fix mby_start for interlaced content
Michael Niedermayer [Sat, 14 Dec 2013 16:11:21 +0000 (17:11 +0100)]
avcodec/vc1dec: fix mby_start for interlaced content

Fixes first frame of Ticket2531

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/vc1: fix mb_height for field pictures
Michael Niedermayer [Sat, 14 Dec 2013 13:52:31 +0000 (14:52 +0100)]
avcodec/vc1: fix mb_height for field pictures

Fixes ticket2531

Tables are always allocated now with sufficient space for either progressive
or interlaced content. The alternative would be to detect a change
and reallocate.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortpdec_h264: Check the return value of functions doing allocations
Michael Niedermayer [Fri, 13 Dec 2013 00:27:26 +0000 (01:27 +0100)]
rtpdec_h264: Check the return value of functions doing allocations

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agosdp: Check theora colorspace before producing the configuration string
Martin Storsjö [Fri, 13 Dec 2013 22:27:26 +0000 (00:27 +0200)]
sdp: Check theora colorspace before producing the configuration string

This avoids a memory leak (or having to worry about freeing the
config string) if the colorspace isn't accepted.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohdsenc: Check the init_file() return code
Michael Niedermayer [Thu, 12 Dec 2013 20:04:24 +0000 (21:04 +0100)]
hdsenc: Check the init_file() return code

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohdsenc: Fix an off by one error in an array size check
Michael Niedermayer [Wed, 11 Dec 2013 19:17:23 +0000 (20:17 +0100)]
hdsenc: Fix an off by one error in an array size check

Signed-off-by: Martin Storsjö <martin@martin.st>