ffmpeg.git
6 years agoffmpeg: move decoded_frame->pts computation together
Michael Niedermayer [Thu, 26 Jul 2012 15:57:36 +0000 (17:57 +0200)]
ffmpeg: move decoded_frame->pts computation together

This clarifies the code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: Fix rounding errors in decoded_frame->pts computation
Michael Niedermayer [Thu, 26 Jul 2012 15:56:52 +0000 (17:56 +0200)]
ffmpeg: Fix rounding errors in decoded_frame->pts computation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: fix assumed decoded_frame->pts timebase
Michael Niedermayer [Thu, 26 Jul 2012 15:56:07 +0000 (17:56 +0200)]
ffmpeg: fix assumed decoded_frame->pts timebase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: reset decoded_frame->pts after rescaling.
Michael Niedermayer [Thu, 26 Jul 2012 15:51:56 +0000 (17:51 +0200)]
ffmpeg: reset decoded_frame->pts after rescaling.

This ensures its not used afterwards.
This commit should not change anything as it should not have been used afterwards.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompc8: Initialize AVFrame properly
Michael Niedermayer [Thu, 26 Jul 2012 15:45:44 +0000 (17:45 +0200)]
mpc8: Initialize AVFrame properly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompc7: Initialize AVFrame properly
Michael Niedermayer [Thu, 26 Jul 2012 15:42:08 +0000 (17:42 +0200)]
mpc7: Initialize AVFrame properly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: fix units of next_?ts in debug printing routine.
Michael Niedermayer [Thu, 26 Jul 2012 15:12:07 +0000 (17:12 +0200)]
ffmpeg: fix units of next_?ts in debug printing routine.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_cabac: switch to av_assert
Michael Niedermayer [Thu, 26 Jul 2012 14:33:39 +0000 (16:33 +0200)]
h264_cabac: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_cabac: switch to av_assert
Michael Niedermayer [Thu, 26 Jul 2012 14:33:17 +0000 (16:33 +0200)]
h264_cabac: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/af_amerge: avfilter_copy_buffer_ref_props will overwrite output pts
William Yu [Thu, 26 Jul 2012 08:05:58 +0000 (10:05 +0200)]
lavfi/af_amerge: avfilter_copy_buffer_ref_props will overwrite output pts

6 years agoomadec: switch to AVSTREAM_PARSE_FULL_RAW
Michael Niedermayer [Thu, 26 Jul 2012 01:30:35 +0000 (03:30 +0200)]
omadec: switch to AVSTREAM_PARSE_FULL_RAW

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoloasdec: switch to AVSTREAM_PARSE_FULL_RAW
Michael Niedermayer [Thu, 26 Jul 2012 01:30:20 +0000 (03:30 +0200)]
loasdec: switch to AVSTREAM_PARSE_FULL_RAW

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaacdec: switch to AVSTREAM_PARSE_FULL_RAW
Michael Niedermayer [Thu, 26 Jul 2012 01:29:59 +0000 (03:29 +0200)]
aacdec: switch to AVSTREAM_PARSE_FULL_RAW

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohls: replace probsize=0 by noheader flag removial.
Michael Niedermayer [Thu, 26 Jul 2012 00:52:08 +0000 (02:52 +0200)]
hls: replace probsize=0 by noheader flag removial.

This fixes h264 timestamps in hls
Fixes ticket1572

Tested-by: crtmpserver
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_add_index_entry: reject AV_NOPTS_VALUE
Michael Niedermayer [Tue, 24 Jul 2012 16:10:48 +0000 (18:10 +0200)]
ff_add_index_entry: reject AV_NOPTS_VALUE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: move generic index generation code to a later point
Michael Niedermayer [Tue, 24 Jul 2012 16:00:11 +0000 (18:00 +0200)]
lavf: move generic index generation code to a later point

By moving it to a later point relative and unknown timestamps
are more likely to have been corrected

similar patch reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Conflicts:

libavformat/utils.c

6 years agoparse_packet: use pkt.pos always instead of the avparser offset.
Michael Niedermayer [Thu, 26 Jul 2012 00:20:59 +0000 (02:20 +0200)]
parse_packet: use pkt.pos always instead of the avparser offset.

This is more correct and will be needed when the code is moved to
a later point.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowav: switch to AVSTREAM_PARSE_FULL_RAW
Michael Niedermayer [Thu, 26 Jul 2012 00:12:35 +0000 (02:12 +0200)]
wav: switch to AVSTREAM_PARSE_FULL_RAW

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_raw_audio_read_header: mark as AVSTREAM_PARSE_FULL_RAW
Michael Niedermayer [Thu, 26 Jul 2012 00:11:06 +0000 (02:11 +0200)]
ff_raw_audio_read_header: mark as AVSTREAM_PARSE_FULL_RAW

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflacdec: mark as AVSTREAM_PARSE_FULL_RAW
Michael Niedermayer [Tue, 24 Jul 2012 15:39:54 +0000 (17:39 +0200)]
flacdec: mark as AVSTREAM_PARSE_FULL_RAW

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomp3dec: mark as AVSTREAM_PARSE_FULL_RAW
Michael Niedermayer [Tue, 24 Jul 2012 15:40:25 +0000 (17:40 +0200)]
mp3dec: mark as AVSTREAM_PARSE_FULL_RAW

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomovenc: fix remuxing of yuv2
Piotr Bandurski [Wed, 25 Jul 2012 09:59:05 +0000 (11:59 +0200)]
movenc: fix remuxing of yuv2

Attached patch fixes remuxing of yuv2 in mov (and does not break remuxing of yuvs)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoprobe_codec: fix memory corruption
Michael Niedermayer [Wed, 25 Jul 2012 23:05:01 +0000 (01:05 +0200)]
probe_codec: fix memory corruption

Found-by: Tanami Ohad
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: warn about new streams after startup.
Nicolas George [Wed, 25 Jul 2012 15:46:00 +0000 (17:46 +0200)]
ffmpeg: warn about new streams after startup.

6 years agofaq: explain about new streams, probesize and analyzeduration.
Nicolas George [Wed, 25 Jul 2012 15:23:39 +0000 (17:23 +0200)]
faq: explain about new streams, probesize and analyzeduration.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 25 Jul 2012 20:00:06 +0000 (22:00 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Add a new option 'rtmp_pageurl'
  doc: Update the description of the rtmp_tcurl option
  rtmp: Make the description of the rtmp_tcurl option more generic
  libfdk-aacenc: add LATM/LOAS encapsulation support
  sctp: add port missing error message
  tcp: add port missing error message
  avfilter: Fix printf format string conversion specifier

Conflicts:
libavcodec/version.h
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibvpxenc: switch to av_assert
Michael Niedermayer [Wed, 25 Jul 2012 19:35:48 +0000 (21:35 +0200)]
libvpxenc: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agointrax8: asserts cleanup
Michael Niedermayer [Wed, 25 Jul 2012 19:35:30 +0000 (21:35 +0200)]
intrax8: asserts cleanup

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortmp: Add a new option 'rtmp_pageurl'
Samuel Pitoiset [Tue, 24 Jul 2012 14:29:40 +0000 (16:29 +0200)]
rtmp: Add a new option 'rtmp_pageurl'

This option specifies the URL of the web page in which the media
was embedded.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodoc: Update the description of the rtmp_tcurl option
Samuel Pitoiset [Tue, 24 Jul 2012 14:29:39 +0000 (16:29 +0200)]
doc: Update the description of the rtmp_tcurl option

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmp: Make the description of the rtmp_tcurl option more generic
Samuel Pitoiset [Tue, 24 Jul 2012 14:29:38 +0000 (16:29 +0200)]
rtmp: Make the description of the rtmp_tcurl option more generic

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolibfdk-aacenc: add LATM/LOAS encapsulation support
Kieran Kunhya [Mon, 23 Jul 2012 16:20:04 +0000 (11:20 -0500)]
libfdk-aacenc: add LATM/LOAS encapsulation support

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosctp: add port missing error message
Jordi Ortiz [Tue, 24 Jul 2012 17:56:39 +0000 (19:56 +0200)]
sctp: add port missing error message

Without this patch a user a bit absent-minded may not notice that
the connection doesn't work because the port is missing.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agotcp: add port missing error message
Jordi Ortiz [Tue, 24 Jul 2012 17:59:53 +0000 (19:59 +0200)]
tcp: add port missing error message

Without this patch a user a bit absent-minded may not notice that
the connection doesn't work because the port is missing.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agohls: call avformat_find_stream_info()
Michael Niedermayer [Wed, 25 Jul 2012 15:40:33 +0000 (17:40 +0200)]
hls: call avformat_find_stream_info()

This is needed to correctly demux h264 in ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoav_find_stream_info: skip flushing codecs and estimating timings if probe_size==0
Michael Niedermayer [Wed, 25 Jul 2012 15:39:25 +0000 (17:39 +0200)]
av_find_stream_info: skip flushing codecs and estimating timings if probe_size==0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: update avui test due to
Michael Niedermayer [Wed, 25 Jul 2012 12:28:08 +0000 (14:28 +0200)]
fate: update avui test due to

commit 20e88d86182d9bb49112648d9a42849a7b17eacd

    Fix avui stream-copy.

    The native decoder and MPlayer's binary decoder only need the
    APRG atom, QuickTime at least requires also the ARES atom and
    four additional 0 bytes padding at the end of stsd.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: use av_guess_sample_aspect_ratio() for guessing the aspect ratio
Stefano Sabatini [Tue, 24 Jul 2012 07:43:02 +0000 (09:43 +0200)]
ffprobe: use av_guess_sample_aspect_ratio() for guessing the aspect ratio

This is consistent with what av_dump_format() does.

In particular, fix trac ticket #1568.

6 years agolavf/avformat.h: fix verb person for av_guess_sample_aspect_ratio()
Stefano Sabatini [Tue, 24 Jul 2012 07:41:48 +0000 (09:41 +0200)]
lavf/avformat.h: fix verb person for av_guess_sample_aspect_ratio()

Prefer impersonal form over third person, consistent with the rest of
docs.

6 years agolavfi/avfilter.h: add doxy for AVFilterLink.out_buf
Stefano Sabatini [Sun, 22 Jul 2012 10:12:51 +0000 (12:12 +0200)]
lavfi/avfilter.h: add doxy for AVFilterLink.out_buf

6 years agolavfi/avfilter.h: add doxy for AVFilterLink.cur_buf
Stefano Sabatini [Sun, 22 Jul 2012 09:24:27 +0000 (11:24 +0200)]
lavfi/avfilter.h: add doxy for AVFilterLink.cur_buf

6 years agoFix avui stream-copy.
Carl Eugen Hoyos [Wed, 25 Jul 2012 07:26:17 +0000 (09:26 +0200)]
Fix avui stream-copy.

The native decoder and MPlayer's binary decoder only need the
APRG atom, QuickTime at least requires also the ARES atom and
four additional 0 bytes padding at the end of stsd.

6 years agoavfilter: Fix printf format string conversion specifier
Diego Biurrun [Tue, 24 Jul 2012 21:58:59 +0000 (23:58 +0200)]
avfilter: Fix printf format string conversion specifier

libavfilter/avfilter.c:224:9: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 5 has type ‘int’ [-Wformat]

6 years agolavf: Set pos for all packets of AVSTREAM_PARSE_FULL_RAW files.
Michael Niedermayer [Tue, 24 Jul 2012 15:34:13 +0000 (17:34 +0200)]
lavf: Set pos for all packets of AVSTREAM_PARSE_FULL_RAW files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoimgconvert: Implement avcodec_find_best_pix_fmt_of_list()
Michael Niedermayer [Sat, 14 Jul 2012 23:50:02 +0000 (01:50 +0200)]
imgconvert: Implement avcodec_find_best_pix_fmt_of_list()

The old avcodec_find_best_pix_fmt() was insufficient due to 64 pix_fmt limit.
In ffmpeg this problem has been solved long ago through avcodec_find_best_pix_fmt2()
Today libav has added a incompatible modified version of avcodec_find_best_pix_fmt2()
under the same name, thus again breaking ABI/API ...

The avcodec_find_best_pix_fmt_of_list() added in this commit here makes the libav
API available to ffmpeg users too.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoriff: make the G723.1 in wav output compatible with WMP/msacm codec
Piotr Bandurski [Tue, 24 Jul 2012 09:42:55 +0000 (11:42 +0200)]
riff: make the G723.1 in wav output compatible with WMP/msacm codec

Attached patch (together with demuxing patch) allows WMP/msacm G723.1 codec decode files encoded by FFmpeg.

Tested with both 6400 and 5333 mode

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: factor AVStream st out
Michael Niedermayer [Tue, 24 Jul 2012 15:33:15 +0000 (17:33 +0200)]
lavf: factor AVStream st out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoparse_packet: reset pkt->pos after it has been used
Michael Niedermayer [Tue, 24 Jul 2012 15:29:47 +0000 (17:29 +0200)]
parse_packet: reset pkt->pos after it has been used

This should have no effect as it was not used in this case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibopenjpegenc: set numresolution max to INT_MAX
Michael Bradshaw [Thu, 19 Jul 2012 03:48:39 +0000 (21:48 -0600)]
libopenjpegenc: set numresolution max to INT_MAX

OpenJPEG doesn't have a max lowres limit, so don't enforce an arbitrary one.

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 24 Jul 2012 18:43:07 +0000 (20:43 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE code
  rtmp: Move the CONFIG_ condition into the if conditions
  aac: Mention abbreviation as well in long_name
  build: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabled
  doc: Add Git configuration section
  configure: Add a dependency on https for rtmpts
  rtp: Only choose static payload types if the sample rate and channels are right

Conflicts:
doc/git-howto.texi
libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: keep packet/frame availability in global structures.
Nicolas George [Mon, 23 Jul 2012 14:58:22 +0000 (16:58 +0200)]
ffmpeg: keep packet/frame availability in global structures.

This replaces the use of the no_packet and no_frame arrays.

6 years agoriff: fix remuxing of G723_1 in wav
Piotr Bandurski [Mon, 23 Jul 2012 22:40:42 +0000 (00:40 +0200)]
riff: fix remuxing of G723_1 in wav

Attached patch fixes remuxing of G723.1 in wav, so the output is playable by WMP.
(It's still not enough for encoding - probably some extradata should be added to the output file
to make it playable by WMP/win codec)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortmp: Add credit/copyright to librtmp authors for parts of the RTMPE code
Martin Storsjö [Tue, 24 Jul 2012 13:01:36 +0000 (16:01 +0300)]
rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE code

Our implementation of RTMPE is heavily based on librtmp.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoRevert "lavf: count skipped samples for initial timestamps."
Michael Niedermayer [Tue, 24 Jul 2012 12:55:30 +0000 (14:55 +0200)]
Revert "lavf: count skipped samples for initial timestamps."

This reverts commit 885fc058655efee94203314984ce99b301fdebb1.
This commit caused timestamps in case of generic seeking to become
inconsistent.

6 years agortmp: Move the CONFIG_ condition into the if conditions
Samuel Pitoiset [Tue, 24 Jul 2012 11:46:28 +0000 (13:46 +0200)]
rtmp: Move the CONFIG_ condition into the if conditions

This makes sure these calls are removed by dead code elimination
even if optimization is disabled. This fixes building without
crypto libraries without optimization.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoiffdec: Fix integer overflow.
Michael Niedermayer [Tue, 24 Jul 2012 03:17:36 +0000 (05:17 +0200)]
iffdec: Fix integer overflow.

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dec: dont apply the loop filter on fields
Michael Niedermayer [Tue, 24 Jul 2012 02:52:58 +0000 (04:52 +0200)]
vc1dec: dont apply the loop filter on fields

Fixes read of uninitialized memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dec: dont attempt error concealment on field pictures.
Michael Niedermayer [Tue, 24 Jul 2012 02:05:18 +0000 (04:05 +0200)]
vc1dec: dont attempt error concealment on field pictures.

This is not implemented and doesnt work.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoec: print picture type with concealment error message.
Michael Niedermayer [Tue, 24 Jul 2012 02:04:54 +0000 (04:04 +0200)]
ec: print picture type with concealment error message.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaac: Mention abbreviation as well in long_name
Diego Biurrun [Tue, 24 Jul 2012 00:14:38 +0000 (02:14 +0200)]
aac: Mention abbreviation as well in long_name

Most people know the codec as "AAC" and not "Advanced Audio Coding".

6 years agotools/bisect-create: Support "bisect run"
Alexander Strasser [Wed, 11 Jul 2012 21:12:00 +0000 (23:12 +0200)]
tools/bisect-create: Support "bisect run"

  Make it possible to use the run bisect sub command. As with all
other ffbisect commands, revisions that do not contain the needed
tools are skipped.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
6 years agodsputil_mmx: fix incorrect assembly code
yang [Mon, 23 Jul 2012 22:51:10 +0000 (00:51 +0200)]
dsputil_mmx: fix incorrect assembly code

In file libavcodec/x86/dsputil_mmx.c, function ff_put_pixels_clamped_mmx(), there are two assembly code blocks. In the first block (in the unrolled loop), the instructions "movq 8%3, %%mm1 \n\t" etc have problem.
For above instruction, it is clear what the programmer wants: a load from p + 8. But this assembly code doesn’t guarantee that. It only works if the compiler puts p in a register to produce an instruction like this: “movq 8(%edi), %mm1”. During compiler optimization, it is possible that the compiler will be able to constant propagate into p. Suppose p = &x[10000]. Then operand 3 can become 10000(%edi), where %edi holds &x. And the instruction becomes “movq 810000(%edx)”. That is, it will stride by 810000 instead of 8.
This will cause the segmentation fault.
This error was fixed in the second block of the assembly code, but not in the unrolled loop.

How to reproduce:
This error is exposed when we build the ffmpeg using Intel C++ Compiler, IPO+PGO optimization. The ffmpeg was crashed when decoding a mjpeg video.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabled
Diego Biurrun [Mon, 23 Jul 2012 21:53:34 +0000 (23:53 +0200)]
build: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabled

The ffrtmpcrypt protocol depends on external libraries, which are
also required to compile the header file.

6 years agortmpproto: fix compilation without optimizations
Michael Niedermayer [Mon, 23 Jul 2012 22:11:14 +0000 (00:11 +0200)]
rtmpproto: fix compilation without optimizations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Add a dependency on https for rtmpts
Martin Storsjö [Mon, 23 Jul 2012 13:38:45 +0000 (16:38 +0300)]
configure: Add a dependency on https for rtmpts

The rtmpts protocol uses https implicitly, via the ffrtmphttp
protocol, but the ffrtmphttp protocol is also useable for plain
rtmpt without https, so the dependency needs to be added here instead.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodoc: Add Git configuration section
Diego Biurrun [Sun, 22 Jul 2012 13:11:25 +0000 (15:11 +0200)]
doc: Add Git configuration section

6 years agocavsdec: switch to av_assert
Michael Niedermayer [Mon, 23 Jul 2012 20:18:16 +0000 (22:18 +0200)]
cavsdec: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/bitstream: switch to av_assert
Michael Niedermayer [Mon, 23 Jul 2012 20:17:52 +0000 (22:17 +0200)]
libavcodec/bitstream: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocosmetics: iff: split very long line
Paul B Mahol [Mon, 23 Jul 2012 21:15:23 +0000 (21:15 +0000)]
cosmetics: iff: split very long line

Also while here sort chunk ids.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoFix typo in v410 decoder.
Carl Eugen Hoyos [Mon, 23 Jul 2012 21:44:13 +0000 (23:44 +0200)]
Fix typo in v410 decoder.

6 years agoconfigure: Add a dependency on https for rtmpts
Martin Storsjö [Mon, 23 Jul 2012 13:38:45 +0000 (16:38 +0300)]
configure: Add a dependency on https for rtmpts

The rtmpts protocol uses https implicitly, via the ffrtmphttp
protocol, but the ffrtmphttp protocol is also useable for plain
rtmpt without https, so the dependency needs to be added here instead.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortp: Only choose static payload types if the sample rate and channels are right
Adriano Pallavicino [Tue, 17 Jul 2012 07:51:13 +0000 (09:51 +0200)]
rtp: Only choose static payload types if the sample rate and channels are right

If using a different sample rate or number of channels, use a dynamic
payload type instead, where the parameters are passed in the SDP.

G722 is a special case where the normal rules don't apply.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agocosmetics: iff: fix typo
Paul B Mahol [Mon, 23 Jul 2012 21:00:17 +0000 (21:00 +0000)]
cosmetics: iff: fix typo

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agovf_deshake: set cur_buf to NULL.
Nicolas George [Mon, 23 Jul 2012 20:20:31 +0000 (22:20 +0200)]
vf_deshake: set cur_buf to NULL.

Fix a segfault.

6 years agofate: enable fate-vc1_sa10143
Michael Niedermayer [Mon, 23 Jul 2012 20:04:35 +0000 (22:04 +0200)]
fate: enable fate-vc1_sa10143

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_colormatrix: add missing semicolon
Paul B Mahol [Mon, 23 Jul 2012 19:53:33 +0000 (19:53 +0000)]
vf_colormatrix: add missing semicolon

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 23 Jul 2012 19:04:06 +0000 (21:04 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  v410dec: Implement explode mode support
  zerocodec: fix direct rendering.
  wav: init st to NULL to avoid a false-positive warning.
  wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit
  h264: refactor NAL decode loop
  RTMPTE protocol support
  RTMPE protocol support
  rtmp: Add ff_rtmp_calc_digest_pos()
  rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global
  swscale: add missing HAVE_INLINE_ASM check.
  lavfi: place x86 inline assembly under HAVE_INLINE_ASM.
  vc1: Add a test for interlaced field pictures
  swscale: Mark all init functions as av_cold
  swscale: x86: Drop pointless _mmx suffix from filenames
  lavf: use conditional notation for default codec in muxer declarations.
  swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM.
  dsputil: ppc: cosmetics: pretty-print
  dsputil: x86: add SHUFFLE_MASK_W macro
  configure: respect CC_O setting in check_cc

Conflicts:
Changelog
configure
libavcodec/v410dec.c
libavcodec/zerocodec.c
libavformat/asfenc.c
libavformat/version.h
libswscale/utils.c
libswscale/x86/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: resampling: add filter type and Kaiser window beta to AVOptions
Justin Ruggles [Sat, 26 May 2012 18:50:02 +0000 (14:50 -0400)]
swr: resampling: add filter type and Kaiser window beta to AVOptions

6 years agov410dec: Implement explode mode support
Derek Buitenhuis [Mon, 23 Jul 2012 15:03:58 +0000 (11:03 -0400)]
v410dec: Implement explode mode support

Try and decode broken files, but still fail if explode
mode is enabled.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agozerocodec: fix direct rendering.
Reimar Döffinger [Sat, 21 Jul 2012 11:22:04 +0000 (13:22 +0200)]
zerocodec: fix direct rendering.

Set picture type before calling get_buffer.
This allows the DR application to make better decisions.
It also fixes a resource leak in case of missing reference frames
since it would call get_buffer but never release_buffer.
Also use FFSWAP to ensure that the AVFrame is properly initialized
in the next get_buffer (in particular that data[0] is NULL).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agowav: init st to NULL to avoid a false-positive warning.
Clément Bœsch [Thu, 1 Sep 2011 18:06:05 +0000 (20:06 +0200)]
wav: init st to NULL to avoid a false-positive warning.

If st is NULL, it means no 'fmt ' tag is found, but 'data' tag (which
needs a previous 'fmt ' tag to be parsed correctly and st initialized)
check will make sure st is never dereferenced in that case.

Fixes warning:
    libavformat/wav.c: In function ‘wav_read_header’:
    libavformat/wav.c:499:44: warning: ‘st’ may be used uninitialized in this function [-Wmaybe-uninitialized]

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agowavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit
Hendrik Leppkes [Fri, 16 Dec 2011 21:43:35 +0000 (22:43 +0100)]
wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agosrc_movie: implement multiple outputs.
Nicolas George [Wed, 18 Jul 2012 23:03:20 +0000 (01:03 +0200)]
src_movie: implement multiple outputs.

The audio and video code paths were too different,
most of the decoding has been rewritten.

6 years agobuffersrc: use avfilter_get_buffer_ref_from_frame.
Nicolas George [Fri, 20 Jul 2012 22:48:23 +0000 (00:48 +0200)]
buffersrc: use avfilter_get_buffer_ref_from_frame.

6 years agolavfi: add avfilter_get_buffer_ref_from_frame.
Nicolas George [Fri, 20 Jul 2012 22:47:52 +0000 (00:47 +0200)]
lavfi: add avfilter_get_buffer_ref_from_frame.

6 years agoh264: refactor NAL decode loop
Ronald S. Bultje [Mon, 23 Jul 2012 03:46:10 +0000 (20:46 -0700)]
h264: refactor NAL decode loop

Write out the NAL decoding loops in full so that they are easier
to parse for a preprocessor without it having to be aware of macros
or other such things in C code.

This also makes the code more readable.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agotls: user documentation
Peter Ross [Sun, 22 Jul 2012 04:25:42 +0000 (14:25 +1000)]
tls: user documentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRTMPTE protocol support
Samuel Pitoiset [Fri, 20 Jul 2012 14:36:47 +0000 (16:36 +0200)]
RTMPTE protocol support

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoRTMPE protocol support
Samuel Pitoiset [Thu, 19 Jul 2012 12:13:58 +0000 (14:13 +0200)]
RTMPE protocol support

This adds two protocols, but one of them is an internal implementation
detail just used as an abstraction layer/generalization in the code. The
RTMPE protocol implementation uses ffrtmpcrypt:// as an alternative to the
tcp:// protocol. This allows moving most of the lower level logic out
from the higher level generic rtmp code.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmp: Add ff_rtmp_calc_digest_pos()
Samuel Pitoiset [Thu, 5 Jul 2012 11:06:07 +0000 (13:06 +0200)]
rtmp: Add ff_rtmp_calc_digest_pos()

This function is used for calculating digest position for RTMP handshake
packets.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global
Samuel Pitoiset [Thu, 5 Jul 2012 11:05:46 +0000 (13:05 +0200)]
rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavfi/showwaves: do not set on outlink->out_buf the sent video frame
Stefano Sabatini [Mon, 23 Jul 2012 12:57:15 +0000 (14:57 +0200)]
lavfi/showwaves: do not set on outlink->out_buf the sent video frame

The video frame reference is passed along the filterchain, and is not
possessed anymore by the filter. If out_buf is not set to NULL, it will
be freed by ff_end_frame() causing a crash.

6 years agoiff: set ham palette alpha to 0xFF
Peter Ross [Mon, 23 Jul 2012 12:04:47 +0000 (14:04 +0200)]
iff: set ham palette alpha to 0xFF

This addresses the problem that some HAM pictures were decoded with
complete transparency as described in the 'iff: ANIM suppport ' thread
on ffmpeg-devel. The decoder was already setting alpha correctly for
CMAP palettes, just not HAM palettes.

6 years agovf_overlay: fix missed return
Michael Niedermayer [Mon, 23 Jul 2012 11:44:05 +0000 (13:44 +0200)]
vf_overlay: fix missed return

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: change "transmedia" into "multimedia".
Nicolas George [Mon, 23 Jul 2012 09:44:48 +0000 (11:44 +0200)]
lavfi: change "transmedia" into "multimedia".

6 years agolavfi: add concat filter.
Nicolas George [Mon, 16 Jul 2012 23:05:05 +0000 (01:05 +0200)]
lavfi: add concat filter.

6 years agoffmpeg: select input file based on output time.
Nicolas George [Sat, 21 Jul 2012 20:54:08 +0000 (22:54 +0200)]
ffmpeg: select input file based on output time.

Filters can change the timings, so input files must not
necessarily be read at the same rythm. This patch select
the input file to read based on the timestamp at output
instead of input. With complex filter graphs, finding the
input for a given output is done by making a request and
checking to what buffer source it has been forwarded.

6 years agoswscale: add missing HAVE_INLINE_ASM check.
Ronald S. Bultje [Sun, 22 Jul 2012 20:55:58 +0000 (13:55 -0700)]
swscale: add missing HAVE_INLINE_ASM check.

The function called in this block is under HAVE_INLINE_ASM itself also.

6 years agolavfi: place x86 inline assembly under HAVE_INLINE_ASM.
Ronald S. Bultje [Sun, 22 Jul 2012 00:03:12 +0000 (17:03 -0700)]
lavfi: place x86 inline assembly under HAVE_INLINE_ASM.

This allows compiling this code using compilers that do not understand
gcc-style inline assembly.

6 years agovc1: Add a test for interlaced field pictures
Mashiat Sarker Shakkhar [Mon, 16 Jul 2012 07:45:23 +0000 (07:45 +0000)]
vc1: Add a test for interlaced field pictures

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>