ffmpeg.git
6 years agooggdec: print a warning if the number of headers mismatch expectations.
Michael Niedermayer [Tue, 25 Sep 2012 13:34:58 +0000 (15:34 +0200)]
oggdec: print a warning if the number of headers mismatch expectations.

This is based on:
commit 7751e4693dd10ec98c20fbd9887233b575034272
Author: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agooggdec: print error when headers couldnt be parses successfully
Michael Niedermayer [Tue, 25 Sep 2012 13:22:05 +0000 (15:22 +0200)]
oggdec: print error when headers couldnt be parses successfully

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7751e4693dd10ec98c20fbd9887233b575034272'
Michael Niedermayer [Tue, 25 Sep 2012 11:34:06 +0000 (13:34 +0200)]
Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'

* commit '7751e4693dd10ec98c20fbd9887233b575034272':
  ogg: check that the expected number of headers had been parsed
  libx264: change default to closed gop to match x264cli
  Use avcodec_free_frame() to free AVFrames.
  lavf: use a malloced AVFrame in try_decode_frame().
  lavc: add avcodec_free_frame().
  lavc: ensure extended_data is set properly on decoding
  lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults()
  lavc: use av_mallocz to allocate AVFrames.
  lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults

Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
libavcodec/utils.c
libavcodec/version.h
libavfilter/src_movie.c
libavformat/oggdec.c
libavformat/oggdec.h
libavformat/oggparsetheora.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: drop pointless opaque parameter in writer init callback
Stefano Sabatini [Mon, 24 Sep 2012 14:42:09 +0000 (16:42 +0200)]
ffprobe: drop pointless opaque parameter in writer init callback

The parameter was never used.

6 years agoffprobe: reindent after previous commit
Stefano Sabatini [Mon, 24 Sep 2012 16:21:21 +0000 (18:21 +0200)]
ffprobe: reindent after previous commit

6 years agoffprobe: rework checking logic in writer_print_time() and writer_print_rational()
Stefano Sabatini [Mon, 24 Sep 2012 16:18:56 +0000 (18:18 +0200)]
ffprobe: rework checking logic in writer_print_time() and writer_print_rational()

Make writer_print_time() and writer_print_rational() always call
writer_print_int() or writer_print_string(). This way the checks for
determining if the value should be printed or not are consistently
performed in the low level functions.

writer_print_rational() is moved downward in order to avoid a forward
reference.

Simplify/amend the overall logic.

6 years agoFix two "skiping" typo.
Clément Bœsch [Tue, 25 Sep 2012 05:42:32 +0000 (07:42 +0200)]
Fix two "skiping" typo.

6 years agoffv1dec: change bitstream end check to a exact check instead of a +-1 check
Michael Niedermayer [Mon, 24 Sep 2012 02:58:24 +0000 (04:58 +0200)]
ffv1dec: change bitstream end check to a exact check instead of a +-1 check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1: inject sentinels for RC->VLC transitions begining with 1.3
Michael Niedermayer [Mon, 24 Sep 2012 02:54:26 +0000 (04:54 +0200)]
ffv1: inject sentinels for RC->VLC transitions begining with 1.3

This breaks bitstream compatibility of 1.3 VLC streams
This fixes very rare errors in the RC stream at the transition point
to VLC.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1enc: fix RC slice sentinel
Michael Niedermayer [Mon, 24 Sep 2012 02:53:10 +0000 (04:53 +0200)]
ffv1enc: fix RC slice sentinel

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: dont add apic streams for demuxers that dont support it.
Michael Niedermayer [Tue, 25 Sep 2012 00:45:46 +0000 (02:45 +0200)]
lavf: dont add apic streams for demuxers that dont support it.

Fixes crash
Fixes ticket1730

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: Consider the chosen separator when doing CSV escaping
Alexander Strasser [Sun, 16 Sep 2012 23:51:53 +0000 (01:51 +0200)]
ffprobe: Consider the chosen separator when doing CSV escaping

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
6 years agoffprobe: Rename variable in csv_escape_str()
Alexander Strasser [Sun, 16 Sep 2012 23:31:44 +0000 (01:31 +0200)]
ffprobe: Rename variable in csv_escape_str()

Sync to 3245be9 .

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
6 years agoffprobe: Simplify CSV field quoting code
Alexander Strasser [Sun, 16 Sep 2012 23:26:11 +0000 (01:26 +0200)]
ffprobe: Simplify CSV field quoting code

Sync with bac1b31 .

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
6 years agoARM: libswresample: NEON optimised generic fltp to s16 conversion
Mans Rullgard [Mon, 10 Sep 2012 14:47:00 +0000 (15:47 +0100)]
ARM: libswresample: NEON optimised generic fltp to s16 conversion

Adapted to swr by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: make sure the last data element is NULL so we can use it to detect the number...
Michael Niedermayer [Mon, 24 Sep 2012 20:52:36 +0000 (22:52 +0200)]
swr: make sure the last data element is NULL so we can use it to detect the number of channels

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoARM: libswresample: NEON optimised stereo fltp to s16 conversion
Mans Rullgard [Mon, 10 Sep 2012 14:47:00 +0000 (15:47 +0100)]
ARM: libswresample: NEON optimised stereo fltp to s16 conversion

Adaption to swr by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoARM: libswresample: NEON optimised flat float to s16 conversion
Mans Rullgard [Sun, 9 Sep 2012 18:25:43 +0000 (19:25 +0100)]
ARM: libswresample: NEON optimised flat float to s16 conversion

Adapted to swr by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoogg: check that the expected number of headers had been parsed
Luca Barbato [Wed, 19 Sep 2012 23:01:43 +0000 (01:01 +0200)]
ogg: check that the expected number of headers had been parsed

Not having the header for a codec is a tell-tale of a broken file.

6 years agolavf/utils: remove loop on AVERROR(EAGAIN) in av_read_frame()
Stefano Sabatini [Mon, 24 Sep 2012 18:38:14 +0000 (20:38 +0200)]
lavf/utils: remove loop on AVERROR(EAGAIN) in av_read_frame()

The loop was introduced in 64d340c62ad5954c1a834df2d26057135e771774, and
was likely breaking non blocking reads as it busy loops.

6 years agolibx264: change default to closed gop to match x264cli
John Van Sickle [Sat, 22 Sep 2012 18:41:16 +0000 (14:41 -0400)]
libx264: change default to closed gop to match x264cli

open-gop can be enabled with "-flags -cgop"

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agofate: fix --disable-ffprobe
Michael Niedermayer [Mon, 24 Sep 2012 16:20:29 +0000 (18:20 +0200)]
fate: fix --disable-ffprobe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/mmvideo: forward reget_buffer return value in mm_decode_frame()
Stefano Sabatini [Wed, 25 Jul 2012 06:43:56 +0000 (08:43 +0200)]
lavc/mmvideo: forward reget_buffer return value in mm_decode_frame()

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 24 Sep 2012 11:53:32 +0000 (13:53 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtp: Packetization of JPEG (RFC 2435)
  smoothstreamingenc: Copy the SAR on the AVStreams as well

Conflicts:
Changelog
libavformat/rtpenc.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoppc/cpu: make linux 32bit specific altivec detection depend on __linux__
Michael Niedermayer [Mon, 24 Sep 2012 11:24:00 +0000 (13:24 +0200)]
ppc/cpu: make linux 32bit specific altivec detection depend on __linux__

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: enable runtime cpu detect by default.
Michael Niedermayer [Fri, 21 Sep 2012 16:01:33 +0000 (18:01 +0200)]
configure: enable runtime cpu detect by default.

with the exception of libpostproc runtime_cpudetect = no is not
supported thus having no as default really is quite odd, it results in
a libpostproc where HAVE_MMX* have very different meaning from the
rest of ffmpeg and it breaks any x86 cpu that doesnt support mmx2
because mmx2 is hardcoded as a result

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoUse avcodec_free_frame() to free AVFrames.
Anton Khirnov [Fri, 21 Sep 2012 07:10:23 +0000 (09:10 +0200)]
Use avcodec_free_frame() to free AVFrames.

6 years agolavf: use a malloced AVFrame in try_decode_frame().
Anton Khirnov [Fri, 21 Sep 2012 07:09:01 +0000 (09:09 +0200)]
lavf: use a malloced AVFrame in try_decode_frame().

This allows using avcodec_free_frame() to free it properly.

6 years agolavc: add avcodec_free_frame().
Anton Khirnov [Fri, 21 Sep 2012 07:07:02 +0000 (09:07 +0200)]
lavc: add avcodec_free_frame().

Since an AVFrame now has malloced members (extended_data), it must have
a destructor.

6 years agolavc: ensure extended_data is set properly on decoding
Anton Khirnov [Fri, 21 Sep 2012 07:04:12 +0000 (09:04 +0200)]
lavc: ensure extended_data is set properly on decoding

6 years agolavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults()
Anton Khirnov [Fri, 21 Sep 2012 06:30:42 +0000 (08:30 +0200)]
lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults()

6 years agolavc: use av_mallocz to allocate AVFrames.
Anton Khirnov [Mon, 24 Sep 2012 05:17:13 +0000 (07:17 +0200)]
lavc: use av_mallocz to allocate AVFrames.

Otherwise the frame is uninitialized, so avcodec_get_frame_defaults()
cannot determine whether to free extended_data.

6 years agolavc: rename the argument of avcodec_alloc_frame/get_frame_defaults
Anton Khirnov [Fri, 21 Sep 2012 06:28:49 +0000 (08:28 +0200)]
lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults

AVFrame is used for both audio and video, so calling the argument 'pic'
is misleading.

6 years agolavc/roqvideodec: fix error message
Stefano Sabatini [Sun, 9 Sep 2012 09:12:14 +0000 (11:12 +0200)]
lavc/roqvideodec: fix error message

Remove redundant reference to codec name, it is already mentioned in the
log header.

6 years agolavc/roqvideodec: propagate reget_buffer() error code
Stefano Sabatini [Sun, 9 Sep 2012 09:11:43 +0000 (11:11 +0200)]
lavc/roqvideodec: propagate reget_buffer() error code

6 years agolavc/roqvideodec: remove useless headers
Stefano Sabatini [Sun, 9 Sep 2012 09:10:05 +0000 (11:10 +0200)]
lavc/roqvideodec: remove useless headers

6 years agotests/fate-ffprobe: fix typo in metadata comment
Stefano Sabatini [Mon, 24 Sep 2012 08:32:52 +0000 (10:32 +0200)]
tests/fate-ffprobe: fix typo in metadata comment

6 years agotests/fate-ffprobe: use an ffmetadata file for the injected metadata
Stefano Sabatini [Sun, 23 Sep 2012 23:27:36 +0000 (01:27 +0200)]
tests/fate-ffprobe: use an ffmetadata file for the injected metadata

Workaround commandline msys issues, also allow more flexibility.
Should fix ffprobe tests on mingw+MSVC.

6 years agolavf/utils: add error check in av_read_frame()
Stefano Sabatini [Sun, 23 Sep 2012 22:33:15 +0000 (00:33 +0200)]
lavf/utils: add error check in av_read_frame()

In particular, fix crash when the input file contains no packets (e.g. an
ffmeta input).

6 years agora144: factor division out
Michael Niedermayer [Sun, 23 Sep 2012 16:30:41 +0000 (18:30 +0200)]
ra144: factor division out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: sort codec lists.
Nicolas George [Sat, 22 Sep 2012 17:26:27 +0000 (19:26 +0200)]
cmdutils: sort codec lists.

The lists are sorted first by type (video first)
and then alphabetically by name.

Fix ticket #1669.

6 years agortp: Packetization of JPEG (RFC 2435)
Samuel Pitoiset [Sun, 23 Sep 2012 14:17:41 +0000 (16:17 +0200)]
rtp: Packetization of JPEG (RFC 2435)

6 years agosmoothstreamingenc: Copy the SAR on the AVStreams as well
Martin Storsjö [Sat, 22 Sep 2012 21:18:23 +0000 (00:18 +0300)]
smoothstreamingenc: Copy the SAR on the AVStreams as well

This is required in chained muxers, if the SAR happens to be set.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoconfigure: disable VDA on ppc, fix build
Sebastien Zwickert [Sun, 23 Sep 2012 15:25:36 +0000 (17:25 +0200)]
configure: disable VDA on ppc, fix build

Fixes Ticket1760

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoDocument why we always send a Range HTTP header.
Reimar Döffinger [Sun, 23 Sep 2012 13:26:56 +0000 (15:26 +0200)]
Document why we always send a Range HTTP header.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoDocument that the MPEG12 "fast" functions can read out of bounds.
Reimar Döffinger [Sat, 15 Sep 2012 16:22:21 +0000 (18:22 +0200)]
Document that the MPEG12 "fast" functions can read out of bounds.

This is intentional (and a reason why fast usually should not be used),
but a few people sent patches to "fix" this recently so it would be
better to document this.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoWebVTT demuxer and decoder.
Clément Bœsch [Sat, 1 Sep 2012 12:34:24 +0000 (14:34 +0200)]
WebVTT demuxer and decoder.

6 years agoIntroducing speex RTP demuxing (RFC 5574)
Dmitry Samonenko [Sat, 22 Sep 2012 10:39:03 +0000 (14:39 +0400)]
Introducing speex RTP demuxing (RFC 5574)

RTPDynamicProtocolHandler for speex is added. Initial support for
speex depacketization from RTP stream comes with it.
Currently, only codec audio rate can be applied based on sdp:
* Narrowband    ( 8K)
* Wideband      (16K)
* Ultrawideband (32K)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd initial support for speex RTP packetization (RFC 5574)
Dmitry Samonenko [Sat, 22 Sep 2012 10:32:37 +0000 (14:32 +0400)]
Add initial support for speex RTP packetization (RFC 5574)

* libspeex audio codec is no longer considered unsupported
  when using rtp as output format.
* SDP rtpmap is added for speex payload, formatted according to RFC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 23 Sep 2012 11:55:43 +0000 (13:55 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec: fix memleak in avcodec_encode_audio2()

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRevert "http: only send range header when necessary"
Michael Niedermayer [Sun, 23 Sep 2012 11:21:35 +0000 (13:21 +0200)]
Revert "http: only send range header when necessary"

This reverts commit 48cf0f1c18f2f91363601c94177c71bc3ac13b8e.
This can cause problems with seekability detection

6 years agolavf/find_stream_info: make sure we decode at least one frame for DTS
Michael Niedermayer [Sun, 23 Sep 2012 02:56:51 +0000 (04:56 +0200)]
lavf/find_stream_info: make sure we decode at least one frame for DTS

The channel layout at the demuxer layer is commonly wrong and would
otherwise be used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: dont open a decoder at the top of find_stream_info before probing has finished
Michael Niedermayer [Sun, 23 Sep 2012 02:49:59 +0000 (04:49 +0200)]
lavf: dont open a decoder at the top of find_stream_info before probing has finished

It could open the wrong decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohttp: only send range header when necessary
Duncan Salerno [Sat, 22 Sep 2012 20:17:36 +0000 (21:17 +0100)]
http: only send range header when necessary

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohttp: larger buffer for long URIs
Duncan Salerno [Sat, 22 Sep 2012 20:17:36 +0000 (21:17 +0100)]
http: larger buffer for long URIs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobitmap header lookup: add code comment
rogerdpack [Fri, 21 Sep 2012 19:26:02 +0000 (13:26 -0600)]
bitmap header lookup: add code comment

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowav: Fix DTS detection
Michael Niedermayer [Sat, 22 Sep 2012 23:16:57 +0000 (01:16 +0200)]
wav: Fix DTS detection

Fixes Ticket1474

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: document request_probe properly
Michael Niedermayer [Sat, 22 Sep 2012 23:07:15 +0000 (01:07 +0200)]
lavf: document request_probe properly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: allow using request_probe as a score threshold to accept a codec
Michael Niedermayer [Sat, 22 Sep 2012 23:06:07 +0000 (01:06 +0200)]
lavf: allow using request_probe as a score threshold to accept a codec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: add asendcmd and sendcmd filters
Stefano Sabatini [Mon, 13 Aug 2012 18:13:26 +0000 (20:13 +0200)]
lavfi: add asendcmd and sendcmd filters

6 years agolavfi/hue: simplify/fix setting logic in set_options()
Stefano Sabatini [Sat, 22 Sep 2012 22:26:30 +0000 (00:26 +0200)]
lavfi/hue: simplify/fix setting logic in set_options()

Parse expression only when a new value is explicitly specified.

In particular, avoid double free in case an old expression value is
cached, it is set in the context, it is freed as the old value, and
finally the pointer stored in the context is freed again when the filter
is released.

6 years agoffmpeg: fix 10l (use of uninitilaized variable)
Michael Niedermayer [Sat, 22 Sep 2012 20:09:41 +0000 (22:09 +0200)]
ffmpeg: fix 10l (use of uninitilaized variable)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: remove now unneeded old *_codec_name code
Michael Niedermayer [Sat, 22 Sep 2012 16:20:59 +0000 (18:20 +0200)]
ffmpeg: remove now unneeded old *_codec_name code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg/opt_output_file: extract subtitle codec name through new API
Michael Niedermayer [Sat, 22 Sep 2012 16:57:47 +0000 (18:57 +0200)]
ffmpeg/opt_output_file: extract subtitle codec name through new API

This should fix specifying subtitle codecs with the new syntax in some cases.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: dont match unspecified media types in MATCH_PER_TYPE_OPT
Michael Niedermayer [Sat, 22 Sep 2012 16:56:10 +0000 (18:56 +0200)]
ffmpeg: dont match unspecified media types in MATCH_PER_TYPE_OPT

This would change existing behavior, and should if done, done seperately.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg/opt_preset: update to new option API for reading codec names.
Michael Niedermayer [Sat, 22 Sep 2012 16:16:49 +0000 (18:16 +0200)]
ffmpeg/opt_preset: update to new option API for reading codec names.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: fix overriding codecs with the new syntax
Michael Niedermayer [Sat, 22 Sep 2012 15:56:35 +0000 (17:56 +0200)]
ffmpeg: fix overriding codecs with the new syntax

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: fix memleak in avcodec_encode_audio2()
Justin Ruggles [Thu, 23 Aug 2012 17:47:25 +0000 (13:47 -0400)]
avcodec: fix memleak in avcodec_encode_audio2()

Ensure that padded_frame is freed before returning when needed.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 22 Sep 2012 12:04:44 +0000 (14:04 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sipr: fall back to setting mode based on bit_rate.

Conflicts:
libavcodec/sipr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agorawdec: fix "warning: assignment from incompatible pointer type"
Michael Niedermayer [Sat, 22 Sep 2012 03:09:06 +0000 (05:09 +0200)]
rawdec: fix "warning: assignment from incompatible pointer type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/buffersink: fix check on pixel_fmts in the opaque parameter
Andrew Wason [Sat, 22 Sep 2012 08:59:40 +0000 (10:59 +0200)]
lavfi/buffersink: fix check on pixel_fmts in the opaque parameter

Fix programmatic selection of accepted pixel formats.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agotests: update fate-ffprobe test to make use of -bitexact flag
Stefano Sabatini [Sat, 22 Sep 2012 07:23:13 +0000 (09:23 +0200)]
tests: update fate-ffprobe test to make use of -bitexact flag

Should fix tests with --enable-small.

6 years agoffprobe: reindent after the previous commit
Stefano Sabatini [Sat, 22 Sep 2012 07:17:56 +0000 (09:17 +0200)]
ffprobe: reindent after the previous commit

6 years agoffprobe: add -bitexact boolean option
Stefano Sabatini [Fri, 21 Sep 2012 23:42:29 +0000 (01:42 +0200)]
ffprobe: add -bitexact boolean option

The option is mostly useful to make ffprobe output independent from the
build, and in particular to fix FATE --enable-small failures.

6 years agopnmdec: use explicit casts to remove const to avoid warning with clang
Michael Niedermayer [Sat, 22 Sep 2012 02:51:47 +0000 (04:51 +0200)]
pnmdec: use explicit casts to remove const to avoid warning with clang

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortsp: fix "warning: ret may be used uninitialized in this function"
Michael Niedermayer [Sat, 22 Sep 2012 02:47:45 +0000 (04:47 +0200)]
rtsp: fix "warning: ret may be used uninitialized in this function"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortsp: kill a pointer type warning (void **) vs. (AVFormatContext **)
Michael Niedermayer [Sat, 22 Sep 2012 02:45:12 +0000 (04:45 +0200)]
rtsp: kill a pointer type warning (void **) vs. (AVFormatContext **)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflac_parser: fix fifo ptr wrap check
Michael Niedermayer [Sat, 22 Sep 2012 02:40:10 +0000 (04:40 +0200)]
flac_parser: fix fifo ptr wrap check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohqdn3d: Fix out of array read in LOWPASS
Loren Merritt [Fri, 21 Sep 2012 23:43:16 +0000 (01:43 +0200)]
hqdn3d: Fix out of array read in LOWPASS

Fixes ticket1752

Commit message by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/oggdec: check for begin-of-stream flag in case of chained streams.
Clément Bœsch [Sun, 16 Sep 2012 20:24:11 +0000 (22:24 +0200)]
lavf/oggdec: check for begin-of-stream flag in case of chained streams.

Fix Ticket #1617, revealing a regression I introduced in 8f3eebd.

We need to make sure no stream is added in between Ogg context save and
restore operations (because it would likely lead to a mismatch between
ogg->nstreams and AVFormatContext->nb_streams after the restore op).
This is the reason the ogg->state check is added in ogg_new_stream().
Before this patch, checking for ogg->headers was preventing this:
ogg->headers is always set before any ogg save/restore (though, it was
also preventing from creating the stream when necessary).

6 years agosipr: fall back to setting mode based on bit_rate.
Reimar Döffinger [Thu, 5 Jan 2012 20:01:56 +0000 (21:01 +0100)]
sipr: fall back to setting mode based on bit_rate.

Not all applications (e.g. MPlayer) set block_align, and
when using a different demuxer it might not even be
easily available.
So fall back to selecting mode based on bit rate as before
if block_align has not useful value.
It can't be worse than failing to decode completely.

(cherry picked from commit 1d0d63052b82c76e10c45cd38cdd27677de72e81)

CC: libav-stable@libav.org
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
6 years agoffmpeg: complete mov/mp4 based timebase hack with "f4v" format.
Clément Bœsch [Fri, 21 Sep 2012 13:57:09 +0000 (15:57 +0200)]
ffmpeg: complete mov/mp4 based timebase hack with "f4v" format.

6 years agomxf: export ff_mxf_get_samples_per_frame to lavf
Matthieu Bouron [Thu, 20 Sep 2012 18:31:28 +0000 (20:31 +0200)]
mxf: export ff_mxf_get_samples_per_frame to lavf

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/movenc: add F4V flavor.
Clément Bœsch [Mon, 17 Sep 2012 14:16:16 +0000 (16:16 +0200)]
lavf/movenc: add F4V flavor.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 21 Sep 2012 12:25:21 +0000 (14:25 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx264: add forgotten ;
  matroskadec: fix a sanity check.
  matroskadec: only return corrupt packets that actually contain data
  lavf: zero data/size of the packet passed to read_packet().
  ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code
  ARM: align PIC offset pools to 4 bytes
  ARM: swap source operands in some add instructions
  configure: update tms470 detection for latest version
  lavf probe: prevent codec probe with no data at all seen
  motion_est: fix use of inline on extern functions

Conflicts:
libavcodec/motion_est_template.c
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: print format long_name only if non-NULL
Stefano Sabatini [Fri, 21 Sep 2012 11:58:26 +0000 (13:58 +0200)]
ffprobe: print format long_name only if non-NULL

Fix possible crash when long_name is not defined (for example if
--enable-small).

6 years agolavfi/hue: set to NULL freed pointers
Stefano Sabatini [Fri, 21 Sep 2012 10:41:00 +0000 (12:41 +0200)]
lavfi/hue: set to NULL freed pointers

Possibly safer.

6 years agolavfi/hue: fix crash when resetting the saturation expression
Stefano Sabatini [Fri, 21 Sep 2012 10:33:27 +0000 (12:33 +0200)]
lavfi/hue: fix crash when resetting the saturation expression

Previously when saturation was reinited, the old value was freed when
setting options, and freed again in PARSE_EXPRESSION().

6 years agoffprobe: print codec_long_name only when available
Stefano Sabatini [Fri, 21 Sep 2012 07:25:46 +0000 (09:25 +0200)]
ffprobe: print codec_long_name only when available

Avoid possible segmentation fault if codec_long_name is defined as
NULL (for example if --enable-small).

6 years agolibx264: add forgotten ;
Anton Khirnov [Fri, 21 Sep 2012 07:20:09 +0000 (09:20 +0200)]
libx264: add forgotten ;

6 years agomatroskadec: fix a sanity check.
Anton Khirnov [Thu, 20 Sep 2012 18:04:56 +0000 (20:04 +0200)]
matroskadec: fix a sanity check.

6 years agomatroskadec: only return corrupt packets that actually contain data
Anton Khirnov [Thu, 20 Sep 2012 18:01:43 +0000 (20:01 +0200)]
matroskadec: only return corrupt packets that actually contain data

Fixes bug 372.

6 years agolavf: zero data/size of the packet passed to read_packet().
Anton Khirnov [Thu, 20 Sep 2012 18:00:39 +0000 (20:00 +0200)]
lavf: zero data/size of the packet passed to read_packet().

6 years agoARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code
Mans Rullgard [Thu, 20 Sep 2012 21:55:11 +0000 (22:55 +0100)]
ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code

The Apple assembler refuses to assemble the 3-operand form
in Thumb2 even though it is valid syntax.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoARM: align PIC offset pools to 4 bytes
Mans Rullgard [Thu, 20 Sep 2012 21:53:41 +0000 (22:53 +0100)]
ARM: align PIC offset pools to 4 bytes

When building Thumb2 code, the end of a function, where the PIC
offsets are placed, need not be aligned.  Although the values
are only accessed with instructions allowing unaligned addresses,
keeping them aligned is preferable.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agonutdec: fix mixup of nb_streams and timebase_count
Michael Niedermayer [Fri, 21 Sep 2012 04:29:24 +0000 (06:29 +0200)]
nutdec: fix mixup of nb_streams and timebase_count

Fixes out of array read, should fix ffprove fate failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonutdec: fix type of intermediate variable for ts calculation.
Michael Niedermayer [Fri, 21 Sep 2012 04:27:38 +0000 (06:27 +0200)]
nutdec: fix type of intermediate variable for ts calculation.

Prior to this it could theoretically become negative and read
out of array.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovsrc_testsrc: Fix case without a specified duration
Michael Niedermayer [Fri, 21 Sep 2012 01:00:15 +0000 (03:00 +0200)]
vsrc_testsrc: Fix case without a specified duration

Fixes regression since 98f753ec5198d4f74ba9f68cc85badf8a6257547

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd av_copy_packet()
Andrey Utkin [Thu, 20 Sep 2012 14:30:03 +0000 (17:30 +0300)]
Add av_copy_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMove av_dup_packet() copy logic to separate procedure
Andrey Utkin [Thu, 20 Sep 2012 14:30:02 +0000 (17:30 +0300)]
Move av_dup_packet() copy logic to separate procedure

Done to simplify next commit introducing av_copy_packet()

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