ffmpeg.git
8 years agoOgg: discard non-essential metadata from Vorbis header when creating extradata
Reimar Döffinger [Mon, 31 Jan 2011 19:16:38 +0000 (19:16 +0000)]
Ogg: discard non-essential metadata from Vorbis header when creating extradata

The first part of the metadata, the "vendor" string, is required by
libvorbis, it will refuse to play when it is not available.
Also we do not currently parse that part into metadata so it would also
be lost if we removed it as well.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 8cb3c557a9f3b24bc55325e3f64a2150b983305c)

8 years agoImplement av_samples_alloc() and av_samples_fill_arrays().
Stefano Sabatini [Fri, 14 Jan 2011 23:00:00 +0000 (00:00 +0100)]
Implement av_samples_alloc() and av_samples_fill_arrays().

With minor changes by michael

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoProvide monotone revission numbers in version.sh
Michael Niedermayer [Tue, 1 Feb 2011 11:19:49 +0000 (12:19 +0100)]
Provide monotone revission numbers in version.sh

8 years agoAdd sample_aspect_ratio fields to vsrc_buffer arguments.
Michael Niedermayer [Mon, 31 Jan 2011 19:48:35 +0000 (20:48 +0100)]
Add sample_aspect_ratio fields to vsrc_buffer arguments.
This fixes aspect handling in ffmpeg
This is based on a patch by baptiste

8 years agoAdd sample_aspect_ratio to AVFilterLink
Michael Niedermayer [Mon, 31 Jan 2011 17:51:47 +0000 (18:51 +0100)]
Add sample_aspect_ratio to AVFilterLink

8 years agoRemove pts rescaling code that is useless after 2ff4a2764e5ea74c85b4231bc110540278cf3708
Reimar Döffinger [Mon, 31 Jan 2011 18:25:59 +0000 (19:25 +0100)]
Remove pts rescaling code that is useless after 2ff4a2764e5ea74c85b4231bc110540278cf3708

8 years agoDocument that av_write_header sets stream time_base to a value of it chosing.
Reimar Döffinger [Sat, 29 Jan 2011 12:53:14 +0000 (13:53 +0100)]
Document that av_write_header sets stream time_base to a value of it chosing.

8 years agompegtsenc: fix PMT PID calculation
Mans Rullgard [Mon, 31 Jan 2011 16:49:10 +0000 (16:49 +0000)]
mpegtsenc: fix PMT PID calculation

445996aa51f4f1d9a26456a8511988291a720ba0 caused the PMT PID to be
off by one.  This corrects it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 740ad0d14d1eca7319a34866e896ad93cd65b9e9)

8 years agoRename attribute_used to av_used and move it to attributes.h
Mans Rullgard [Mon, 31 Jan 2011 02:19:30 +0000 (02:19 +0000)]
Rename attribute_used to av_used and move it to attributes.h

This is consistent with most of the other attribute macros.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 365e3c7878e4e821d5dec922d2d51f92ce13f926)

8 years agoReplace defines in libavformat/mpegtsenc.c with AVOptions
Georgi Chorbadzhiyski [Mon, 31 Jan 2011 11:19:51 +0000 (13:19 +0200)]
Replace defines in libavformat/mpegtsenc.c with AVOptions

Around 01/28/11 18:56, Ronald S. Bultje scribbled:
> That patch is now merged, can you submit the update to muxers.texi?
> Then we'll apply the whole thing.

See attached. I hope the documentation is enough.

--
Georgi Chorbadzhiyski
http://georgi.unixsol.org/

From c236024b8254f5c2c45934c30fff390cb0e55a5e Mon Sep 17 00:00:00 2001
From: Georgi Chorbadzhiyski <gf@unixsol.org>
Date: Tue, 25 Jan 2011 13:09:17 +0200
Subject: [PATCH] mpegts: Replace defines in with AVOptions

This patch adds support for setting transport_stream_id,
original_network_id, service_id, pmt_start_pid and start_pid
in mpegts muxer.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 445996aa51f4f1d9a26456a8511988291a720ba0)

8 years agoAdd documentation for the image2 muxer.
Stefano Sabatini [Wed, 26 Jan 2011 21:53:00 +0000 (22:53 +0100)]
Add documentation for the image2 muxer.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e771d2e3fef4d2bcfc08b9eb37296f0e0af1f607)

8 years agoVC1testenc: convert pts values to correct time-base.
Reimar Döffinger [Sat, 29 Jan 2011 12:44:34 +0000 (13:44 +0100)]
VC1testenc: convert pts values to correct time-base.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22e9277aa5e6e5abfd037420093439058d4a14df)

8 years agoasf/wtv: use service_provider and service_name metadata tags
Ronald S. Bultje [Mon, 31 Jan 2011 13:58:14 +0000 (08:58 -0500)]
asf/wtv: use service_provider and service_name metadata tags

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 45430099438d7b4f70ebb23611a29d318ba49687)

8 years agoMake ffmpeg warns the user when the selected sample format is ignored.
Stefano Sabatini [Fri, 14 Jan 2011 14:50:55 +0000 (15:50 +0100)]
Make ffmpeg warns the user when the selected sample format is ignored.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit fa34a3626cf1aa19acbe9f8c6fcddb6c3eb8eaa1)

8 years agoSlightly simplify VP8 inter_predict
Jason Garrett-Glaser [Sun, 30 Jan 2011 05:09:33 +0000 (21:09 -0800)]
Slightly simplify VP8 inter_predict

Merge an if and a switch.
(cherry picked from commit 73be29b0c4297fd0e61e7fe5d925bec397d8fe4a)

8 years agoIn ffplay:get_video_frame(), use frame->pkt_pts rather than reordered_opaque.
Stefano Sabatini [Sun, 16 Jan 2011 17:39:34 +0000 (18:39 +0100)]
In ffplay:get_video_frame(), use frame->pkt_pts rather than reordered_opaque.

AVCodecContext.reordered_opaque is deprecated for this specific use.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 2855080447a226aba7e88e943fd8a8779d6daa98)

8 years agoffplay: in video_thread(), use av_dlog() for timestamp logging.
Stefano Sabatini [Sat, 22 Jan 2011 14:35:00 +0000 (15:35 +0100)]
ffplay: in video_thread(), use av_dlog() for timestamp logging.

Disable logging of rescaled timestamps if DEBUG is not enabled.
Avoid debug log spamming with -loglevel debug.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 13156f40e1f17ec1d0c57e6bf7a2850f673600c0)

8 years agompegts: remove get_pts duplicate of ff_parse_pes_pts.
Vasyl' Vavrychuk [Sun, 30 Jan 2011 15:24:00 +0000 (15:24 +0000)]
mpegts: remove get_pts duplicate of ff_parse_pes_pts.

Signed-off-by: Vasyl' Vavrychuk <vvavrychuk@gmail.com>
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 665132e6204766b1d43ce413d6b1cc2a1d34ea29)

8 years agoEnable native build on QNX/x86
Mans Rullgard [Sun, 30 Jan 2011 01:05:39 +0000 (01:05 +0000)]
Enable native build on QNX/x86
(cherry picked from commit d33ed7b36762bf26694bdfa18e0d811e26c996f8)

8 years agoReplace dprintf with av_dlog
Luca Barbato [Sat, 29 Jan 2011 16:46:18 +0000 (17:46 +0100)]
Replace dprintf with av_dlog

dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb29e4b9f2fdb97036eb7d5c38ae4bd4)

8 years agoFlush final frames in libfaac encoder.
Justin Ruggles [Sat, 29 Jan 2011 18:45:32 +0000 (18:45 +0000)]
Flush final frames in libfaac encoder.

Gives decoded output identical in length to faac commandline encoder.
Fixes Issue 670.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 243f8241dbf4a451e1197661ccd387c519ae3349)

8 years agoFix memory leak in ALS decoder in big endian systems
Vitor Sessak [Sat, 29 Jan 2011 14:39:09 +0000 (15:39 +0100)]
Fix memory leak in ALS decoder in big endian systems

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e0eb963aaa55ddcc54bf80f3261f6a436edca4a3)

8 years agoRearrange MpegEncContext to simplify access from asm
Mans Rullgard [Sat, 29 Jan 2011 17:14:29 +0000 (17:14 +0000)]
Rearrange MpegEncContext to simplify access from asm

This moves the fields needed by asm near the top, before any
structs or other members which complicate the offset calculation.
Modifying other structs will no longer require updating the offsets,
and the asm code is slightly simpler due to the smaller offsets.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d461a4731781e492d83ef254f9c0fbd0ce6e47eb)

8 years agodoc: modify style for texi2html 1.78+
Janne Grunau [Sat, 29 Jan 2011 12:24:13 +0000 (13:24 +0100)]
doc: modify style for texi2html 1.78+

The generated HTML files are similar to the ones generated with
texi2html 1.56k used on the website.

Tested with texi2html 1.78 and 5.0. 1.78 is the minimal recommended
version.

The removed @sp from the titlepage section were ignored until
texi2html 5.0. If not removed the pages generated by 5.0 will have ugly
empty space around the title.
(cherry picked from commit a8f0814a742dee4783afaa5bedb01aa0c77b1fc4)

8 years agoFix overread in altivec DSP function sad16
Vitor Sessak [Sat, 29 Jan 2011 14:14:32 +0000 (14:14 +0000)]
Fix overread in altivec DSP function sad16

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 3af1fe829ee6db5eafe261947e74b8516ffe5188)

8 years agoARM: update MpegEncContext offsets
Mans Rullgard [Sat, 29 Jan 2011 04:39:39 +0000 (04:39 +0000)]
ARM: update MpegEncContext offsets
(cherry picked from commit 0745116c10e5650952c39ea543c66b12fba854e6)

8 years agoMove ff_emulated_edge_mc() into DSPContext.
Ronald S. Bultje [Thu, 27 Jan 2011 03:35:56 +0000 (22:35 -0500)]
Move ff_emulated_edge_mc() into DSPContext.
(cherry picked from commit 2e279598793133ee9c57fd0026d672f076fde4bf)

8 years agoOptimize C version of ff_emulated_edge_mc().
Ronald S. Bultje [Thu, 27 Jan 2011 03:37:50 +0000 (22:37 -0500)]
Optimize C version of ff_emulated_edge_mc().

From ~780 cycles to 551 cycles, mostly just by using libc memcpy()
instead of manually shuffling individual bytes around.
(cherry picked from commit e5262ec44a30a9132f0361f775c5b63d20e4e4d5)

8 years agompegtsenc: support CODEC_ID_AAC_LATM
Peter Ross [Fri, 28 Jan 2011 22:28:03 +0000 (22:28 +0000)]
mpegtsenc: support CODEC_ID_AAC_LATM

$subject. Have used this for loopback testing with mpegts.c.

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
[2. text/x-diff; 0001-mpegtsenc-support-CODEC_ID_AAC_LATM.patch]

From 0f7f9db4b7da1793996af6dda84298507703759a Mon Sep 17 00:00:00 2001
From: Peter Ross <pross@xvid.org>
Date: Sun, 9 Jan 2011 09:45:50 +1100
Subject: [PATCH] mpegtsenc: support CODEC_ID_AAC_LATM

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4d54df8e07dca3e30ebcaffd1a0e750a876700a2)

8 years agortspenc: include os_support.h for system without HAVE_POLL_H
Dave Yeo [Fri, 28 Jan 2011 20:01:52 +0000 (12:01 -0800)]
rtspenc: include os_support.h for system without HAVE_POLL_H

fix compile on OS/2

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit a0788cc6273a7a33cc111f7248248c71fd009916)

8 years agoasfdec: ensure that the whole tag is read.
Anton Khirnov [Thu, 27 Jan 2011 09:41:49 +0000 (10:41 +0100)]
asfdec: ensure that the whole tag is read.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 042950542d6ee70fde01e4edbb6e6da38ebbaf27)

8 years agoos_support: make poll() fallbacks conditional on CONFIG_NETWORK
Mans Rullgard [Fri, 28 Jan 2011 17:16:15 +0000 (17:16 +0000)]
os_support: make poll() fallbacks conditional on CONFIG_NETWORK

poll() is only used by networking code, so the fallback should
only be built if networking is enabled.  Also remove CONFIG_FFSERVER
condition from the declarations.

This should fix building on systems without poll(), broken
by a8475bbdb64e638bd8161df9647876fd23f8a29a.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 362d8f7d9e6a3bca2ce89f767d153d3ab8bf5773)

8 years agoMake the image2 demuxer log more verbose
Stefano Sabatini [Wed, 26 Jan 2011 22:03:38 +0000 (23:03 +0100)]
Make the image2 demuxer log more verbose

Add an error message in case the user requests to write more than one file
and the path does not contain a "%d" or "%0Nd" pattern.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 4fc9ff0ad6f0f6b2c7443c6b4a3a1c817e97fdfd)

8 years agoUpdate mpegts test reference
Mans Rullgard [Fri, 28 Jan 2011 16:58:54 +0000 (16:58 +0000)]
Update mpegts test reference

The output was changed by a7827a17c6b3388322350456d445c94b3a82cd25.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 79dca23dc262742b312161a5dec707eb7b9c8d97)

8 years agoaacdec: Convert some loop copies into memcpy()s.
Alex Converse [Fri, 28 Jan 2011 06:13:50 +0000 (06:13 +0000)]
aacdec: Convert some loop copies into memcpy()s.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e5c82df80ef49957fe532d0992985012d6d97955)

8 years agoAdd muxers.texi file.
Stefano Sabatini [Wed, 26 Jan 2011 22:55:53 +0000 (23:55 +0100)]
Add muxers.texi file.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 85466e1e5f7f1fe50933d2d967a06b45b9222b5b)

8 years agoIn mpegts "reserved_future_use" field must be set to 1 in SDT table
Georgi Chorbadzhiyski [Fri, 28 Jan 2011 16:28:20 +0000 (18:28 +0200)]
In mpegts "reserved_future_use" field must be set to 1 in SDT table

According to EN 300 468 section 3.1 (Definitions):

   Unless otherwise specified within the present document all
   "reserved_future_use" bits is set to "1".

This was not the case for SDT generation so this patch fixes it.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit a7827a17c6b3388322350456d445c94b3a82cd25)

8 years agoIn the rawvideo decoder, set pkt_pts in the output frame.
Stefano Sabatini [Thu, 27 Jan 2011 20:26:38 +0000 (21:26 +0100)]
In the rawvideo decoder, set pkt_pts in the output frame.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 3c802cabba8e85e4f2949c57df947dd1823a15f5)

8 years agoIn the start_frame() debug log, print the reference pos value rather than the evaluat...
Stefano Sabatini [Thu, 27 Jan 2011 00:01:34 +0000 (01:01 +0100)]
In the start_frame() debug log, print the reference pos value rather than the evaluated value converted to int.

That's required because -1 is evaluated as NAN, which converted back
to int looks like a random number, this is especially annoying when
debugging sources with undefined pos (as the video4linux2 device).

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 3e5bc7ff6a23014daf2eb0b9a22986753ae2ec4f)

8 years agoFix VP8 aliasing problems.
Ronald S. Bultje [Fri, 28 Jan 2011 14:51:34 +0000 (09:51 -0500)]
Fix VP8 aliasing problems.

Replace * (uint32_t *) buf accesses with AV_WN32A/AV_COPY32.
(cherry picked from commit 9d4bdcb714f85b5d90ebf9704784a31c88dfb360)

8 years agortsp: make ff_sdp_parse return value forwarded
Luca Barbato [Fri, 28 Jan 2011 02:12:22 +0000 (03:12 +0100)]
rtsp: make ff_sdp_parse return value forwarded

the sdp demuxer did not forward it at all while the rtsp demuxer assumed
a single kind of error
(cherry picked from commit f81c7ac70a7e5e82b0ab0839faf8d22d555efb9d)

8 years agoos: replace select with poll
Luca Barbato [Fri, 28 Jan 2011 02:12:21 +0000 (03:12 +0100)]
os: replace select with poll

Select has limitations on the fd values it could accept and silently
breaks when it is reached.
(cherry picked from commit a8475bbdb64e638bd8161df9647876fd23f8a29a)

8 years agoMake ff_float_to_int16*_c() static.
Alex Converse [Fri, 28 Jan 2011 06:13:49 +0000 (06:13 +0000)]
Make ff_float_to_int16*_c() static.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 5ce5dbc5f3d0bce1f8d76fea1907c91469ebdd01)

8 years agoHide demuxers', muxers' and protocols' objects via the ld version script.
Diego Elio Pettenò [Tue, 25 Jan 2011 22:03:29 +0000 (22:03 +0000)]
Hide demuxers', muxers' and protocols' objects via the ld version script.

This reduces the symbols exported by libavformat from 699 to 451.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e62886403355614f0579a1568a53f04037c90df8)

8 years agoHide the now-prefixed decoders, encoders, parsers, bsf, hwaccel objects.
Diego Elio Pettenò [Tue, 25 Jan 2011 21:40:12 +0000 (21:40 +0000)]
Hide the now-prefixed decoders, encoders, parsers, bsf, hwaccel objects.

This significantly reduces the size of the symbol table in the generated ELF
shared object (as well as the other linked tables).

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit ac28ce5fac2f77891d70c9e49cda65ddb51818b2)

8 years agoVC1testenc: convert pts values to correct time-base.
Reimar Döffinger [Sat, 29 Jan 2011 10:56:25 +0000 (11:56 +0100)]
VC1testenc: convert pts values to correct time-base.

VC1 test container always uses time-base 1 ms, so we must convert
from whatever time-base the application gave us to that, otherwise
the video will play at ridiculous speeds.
It would be possible to signal that a container supports only one
time-base and have code in a layer above do the conversion, but
for a single format this seems over-engineered.

8 years agoRemove useage of memalign() from libmpcodecs, not all platforms have memalign().
Michael Niedermayer [Fri, 28 Jan 2011 20:54:16 +0000 (21:54 +0100)]
Remove useage of memalign() from libmpcodecs, not all platforms have memalign().

8 years agoVorbis-in-Ogg: Do not set timebase to invalid values
Reimar Döffinger [Fri, 28 Jan 2011 19:56:12 +0000 (20:56 +0100)]
Vorbis-in-Ogg: Do not set timebase to invalid values

Avoids an assert when the sample rate is invalid and the timebase
is thus set to e.g. 1/0.
Sample file is http://samples.mplayerhq.hu/ogg/fuzzed-srate-crash.ogg

8 years agoAdd forgotten dependancy of avcodec for vf_mp.c
Michael Niedermayer [Fri, 28 Jan 2011 18:03:10 +0000 (19:03 +0100)]
Add forgotten dependancy of avcodec for vf_mp.c

8 years agocosmetics: indentation and spacing
Justin Ruggles [Thu, 27 Jan 2011 14:21:26 +0000 (14:21 +0000)]
cosmetics: indentation and spacing
(cherry picked from commit b5ec6383432c907bed175f20e39af1a99dc75cfb)

8 years agoRemove the add bias hack for the C version of DSPContext.float_to_int16_*().
Justin Ruggles [Thu, 27 Jan 2011 15:20:43 +0000 (15:20 +0000)]
Remove the add bias hack for the C version of DSPContext.float_to_int16_*().
(cherry picked from commit 9d06d7bce3babb82ed650c13ed13a57f6f626a71)

8 years agomov: add support for little-endian utf16 chapter names
John Stebbins [Wed, 26 Jan 2011 05:15:49 +0000 (05:15 +0000)]
mov: add support for little-endian utf16 chapter names

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 97b04f5ed3ab3a62e57f0c16841fb8f10d0a174c)

8 years agomovenc: byteswap codec_tag in mov_write_ms_tag
Janne Grunau [Thu, 27 Jan 2011 16:26:20 +0000 (17:26 +0100)]
movenc: byteswap codec_tag in mov_write_ms_tag

based on Alex Converse's "Fix ADPCM MS in mov muxing" patch
(cherry picked from commit 795ed278e6d702ad841c3043e2b878afc6f599f4)

8 years agoAdd special case for 2nd-order IIR filter.
Justin Ruggles [Thu, 27 Jan 2011 23:58:27 +0000 (23:58 +0000)]
Add special case for 2nd-order IIR filter.

40% faster in ff_iir_filter_flt() when c->order == 2.
(cherry picked from commit 37cb3eb53449ccefbbe8ea7dc5e66f9036aafe6e)

8 years agoAdd ff_ to AVHWAccel decoders
Luca Barbato [Thu, 27 Jan 2011 02:56:14 +0000 (03:56 +0100)]
Add ff_ to AVHWAccel decoders

That unbreaks compilation of vaapi and dxva2

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit d1b6f33bf2ce56f013a1c5a013a19671c0f30ea0)

8 years agoPrefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
Diego Elio Pettenò [Tue, 25 Jan 2011 22:03:28 +0000 (22:03 +0000)]
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
(cherry picked from commit c6610a216ed2948885772154a2eed696e0cb4aca)

8 years agomov: simplify mov_read_chapters() by using avio_get_str16be
Anton Khirnov [Sun, 23 Jan 2011 11:35:23 +0000 (12:35 +0100)]
mov: simplify mov_read_chapters() by using avio_get_str16be

It probably also fixes a memleak or two.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 225b6d7fdea370de3723420e6adc2f3192439b00)

8 years agoRevert "mov: simplify mov_read_chapters() by using avio_get_str16be"
Mans Rullgard [Wed, 26 Jan 2011 21:54:42 +0000 (21:54 +0000)]
Revert "mov: simplify mov_read_chapters() by using avio_get_str16be"

This reverts commit c34461b35b68ff1f3d04540e0279383c51be8cee.
The wrong version of the patch was committed.
(cherry picked from commit c4f8765ac55562fc6ab705e3d17275b69eb5f71d)

8 years agoVP8: don't overread edges on fourtap MC.
Ronald S. Bultje [Wed, 26 Jan 2011 20:34:36 +0000 (15:34 -0500)]
VP8: don't overread edges on fourtap MC.

Fix C VP8 H+V MC functions which do two-dimensional 4/6-tap filters to
not overread beyond their edges if the second filter is 4-tap, since
the outer pixels aren't there anymore since
44002d8323023c35f51d523a7d305e45103ba7a1.
(cherry picked from commit 22893e10ae8b72880838accc3df97785502ac6aa)

8 years agoAdd ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
Diego Elio Pettenò [Tue, 25 Jan 2011 21:40:11 +0000 (21:40 +0000)]
Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.

None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f6902b1217beda576aa18abf7eb72b03c)

8 years agoMake ff_cmap_read_palette static to libavcodec/iff.c. Delete iff.h.
Diego Elio Pettenò [Tue, 25 Jan 2011 00:29:44 +0000 (00:29 +0000)]
Make ff_cmap_read_palette static to libavcodec/iff.c. Delete iff.h.

The iff.h header only declared one function that is now static, the
libavformat/iff.c source file wasn't using it before. Drop the file
entirely.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 2d162e3825a35b6ac42a27d27c4a3ebbd141828d)

8 years agoAdd ff_ prefix to ac3_common_init().
Justin Ruggles [Tue, 25 Jan 2011 20:07:07 +0000 (20:07 +0000)]
Add ff_ prefix to ac3_common_init().

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4c57cde942b3d28074d0bb06e2ca200bc1098f22)

8 years agoac3: Remove ff_ac3_critical_band_size_tab.
Justin Ruggles [Tue, 25 Jan 2011 20:07:06 +0000 (20:07 +0000)]
ac3: Remove ff_ac3_critical_band_size_tab.

It is only used to generate band_start_tab, which about the same size, at
runtime, so it's simpler just to always hardcode band_start_tab.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 24e3ad3031fa26e12d4b939f0ff0dd6e12f05ef5)

8 years agoMake the avfilter debug functions and macros static to avfilter.c
Diego Elio Pettenò [Tue, 25 Jan 2011 00:29:34 +0000 (00:29 +0000)]
Make the avfilter debug functions and macros static to avfilter.c

This removes ff_get_ref_perms_string, ff_dprintf_ref and ff_dprintf_link
fro the interface of libavfilter.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit eb7ccf8f3369f9e15029ce65370a114206b39fd5)

8 years agoMark C base versions of FFT functions static to fft.c
Diego Elio Pettenò [Tue, 25 Jan 2011 00:29:43 +0000 (00:29 +0000)]
Mark C base versions of FFT functions static to fft.c

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 7767d8d361ca104d74c8390b72db21aa4d7fc322)

8 years agoPass field order flag to libx264
Marco Gittler [Wed, 26 Jan 2011 02:07:34 +0000 (18:07 -0800)]
Pass field order flag to libx264

Signed-off-by: Jason Garrett-Glaser <jason@x264.com>
(cherry picked from commit b09f5482854f9b4a139b1401d196b26db11dd10f)

8 years agompegtsenc: set reserved bits to 1 in PCR field
Georgi Chorbadzhiyski [Tue, 25 Jan 2011 11:20:03 +0000 (11:20 +0000)]
mpegtsenc: set reserved bits to 1 in PCR field

The reserved bits between PCR base and extension fields must be
set to 1.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 535638b55f83ad47e4680883e87b97e69d0847e5)

8 years agoMake ff_add_wav static to ra144.c
Diego Elio Pettenò [Tue, 25 Jan 2011 01:59:35 +0000 (02:59 +0100)]
Make ff_add_wav static to ra144.c

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 1a8867486215abe3b705f7d189723d528cea2b70)

8 years agoMake ff_rtsp_send_cmd_with_content_async static to rtsp.c.
Diego Elio Pettenò [Tue, 25 Jan 2011 00:29:38 +0000 (00:29 +0000)]
Make ff_rtsp_send_cmd_with_content_async static to rtsp.c.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 57c4d01ec9286b3b9f9a0101654f7bc8a00edb63)

8 years agoMake ff_h264_find_frame_end static to h264.c; delete h264_parser.h
Diego Elio Pettenò [Tue, 25 Jan 2011 00:59:30 +0000 (00:59 +0000)]
Make ff_h264_find_frame_end static to h264.c; delete h264_parser.h

The header is empty after making the function static, so delete it and
drop its usage.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 13eb6b90977768116c937c5d6b2e074679a3ad21)

8 years agoMake ff_sin_tabs constant to rdft.c
Diego Elio Pettenò [Tue, 25 Jan 2011 01:59:29 +0000 (02:59 +0100)]
Make ff_sin_tabs constant to rdft.c

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit d625a32d6ba0405e6da061991dfd90f6da2a3b7a)

8 years agoMake ff_spatial_idwt_{init, slice} static to dwt.c
Diego Elio Pettenò [Tue, 25 Jan 2011 01:59:28 +0000 (02:59 +0100)]
Make ff_spatial_idwt_{init, slice} static to dwt.c

Both functions seem to be commanded by the ff_spatial_idwt function
instead.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit ebb06d96ed3f6e1c16f2d40e55c151b5b5522918)

8 years agoMake ff_png_pass_xmin and ff_png_pass_xshift static to png.c.
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:41 +0000 (02:29 +0100)]
Make ff_png_pass_xmin and ff_png_pass_xshift static to png.c.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit f2e246f576cd53e75b3696e1db418be98fbda76f)

8 years agoRemove unused ff_ac3_parse_header_full function.
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:40 +0000 (02:29 +0100)]
Remove unused ff_ac3_parse_header_full function.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 676f1f533e2c2960d81784188592a066b9ff1c3d)

8 years agoMake ff_mxf_pixel_layouts static to mxf.c.
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:37 +0000 (02:29 +0100)]
Make ff_mxf_pixel_layouts static to mxf.c.

Also make it an anonymous structure as never it is accessed by name.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit a3dffc0627dfd85f8b1a72b9b637938dfa197208)

8 years agoMake ff_h264_decode_rbsp_trailing static to h264.c
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:42 +0000 (02:29 +0100)]
Make ff_h264_decode_rbsp_trailing static to h264.c

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 8529731961d79fc0e747b16152df3d470b530537)

8 years agoMake ff_interleave_compare_dts static to utils.c.
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:36 +0000 (02:29 +0100)]
Make ff_interleave_compare_dts static to utils.c.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 101e1f6ff90c3365bfde05469ae26d2ee7f71f3e)

8 years agomov: simplify mov_read_chapters() by using avio_get_str16be
Anton Khirnov [Sun, 23 Jan 2011 11:38:30 +0000 (12:38 +0100)]
mov: simplify mov_read_chapters() by using avio_get_str16be

It probably also fixes a memleak or two.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit c34461b35b68ff1f3d04540e0279383c51be8cee)

8 years agoasfdec: remove some commented-out cruft
Anton Khirnov [Sun, 23 Jan 2011 11:38:29 +0000 (12:38 +0100)]
asfdec: remove some commented-out cruft

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 2934cd9dbf390962ec008182f9eddd4296cf5527)

8 years agolavf: make a variant of ff_get_str16_nolen public
Anton Khirnov [Sun, 23 Jan 2011 11:38:27 +0000 (12:38 +0100)]
lavf: make a variant of ff_get_str16_nolen public

It will be useful in mp3 demuxer and hopeful some other places.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 93b78d12106112d7c5d9cfdcf96fc3dce9dc5f82)

8 years agoarmcc: filter out non-gcc options from ASFLAGS
Mans Rullgard [Tue, 25 Jan 2011 14:45:20 +0000 (14:45 +0000)]
armcc: filter out non-gcc options from ASFLAGS

This allows passing armcc-specific flags with --extra-cflags without
choking the assembler.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d0f0f6287c7fd29474e58fe1b86db2885f20c457)

8 years agoconfigure: add filter_out() function
Mans Rullgard [Tue, 25 Jan 2011 14:44:07 +0000 (14:44 +0000)]
configure: add filter_out() function

This adds a function to filter out words matching a pattern
from a list.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 9d201b260627aacdb00e4a54622849aca11d85ee)

8 years agoDon't do edge emulation unless the edge pixels will be used in MC.
Ronald S. Bultje [Tue, 25 Jan 2011 17:25:07 +0000 (12:25 -0500)]
Don't do edge emulation unless the edge pixels will be used in MC.

Do not emulate larger edges than we will actually use for this round of
MC. Decoding goes from avg+SE 29.972+/-0.023sec to 29.856+/-0.023, i.e.
0.12sec or ~0.4% faster.
(cherry picked from commit 44002d8323023c35f51d523a7d305e45103ba7a1)

8 years agoffmetaenc: Use correct format specifiers.
Jai Menon [Tue, 25 Jan 2011 04:55:43 +0000 (22:55 -0600)]
ffmetaenc: Use correct format specifiers.

Use printf format macros from inttypes.h.
Additionally, this fixes a warning when building with clang.
(cherry picked from commit c0ae5152d19790e8719c8d1d2bf9b761491dbda6)

8 years agointfloat_readwrite: include "mathematics.h" for fallback macros
Mans Rullgard [Tue, 25 Jan 2011 03:33:43 +0000 (03:33 +0000)]
intfloat_readwrite: include "mathematics.h" for fallback macros

This allows this file to build on systems lacking NAN or INFINITY
in math.h.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e781c4e6ff0b93db1ebc0ebe6983b38490117a98)

8 years agotty: remove superflous #include <strings.h>
Mans Rullgard [Tue, 25 Jan 2011 03:31:45 +0000 (03:31 +0000)]
tty: remove superflous #include <strings.h>

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 1e48cdaac32e42a5c87a8f203b5827bdcc46db93)

8 years agoac3: remove ff_ac3_critical_band_size_tab[] external declaration
Mans Rullgard [Tue, 25 Jan 2011 15:48:46 +0000 (15:48 +0000)]
ac3: remove ff_ac3_critical_band_size_tab[] external declaration

This fixes compilation broken by 6ed3b504f984dc6cefde8d57a57726f9d30e5033

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 21c900129c268587fa2df774242bfd8af72ff890)

8 years agoMove ff_ac3_critical_band_size_tab in ac3.c for non-hardcoded tables.
Diego Elio Pettenò [Tue, 25 Jan 2011 01:59:36 +0000 (01:59 +0000)]
Move ff_ac3_critical_band_size_tab in ac3.c for non-hardcoded tables.

This symbol is only ever used to calculate the non-hardcoded tables, so
only enable it in that case, and static to the source unit that uses it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6ed3b504f984dc6cefde8d57a57726f9d30e5033)

8 years agoRemove unused ac3_parametric_bit_allocation function.
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:14 +0000 (23:36 +0000)]
Remove unused ac3_parametric_bit_allocation function.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 362bfe29971b3bb8497d2b341337697be15a257c)

8 years agoMakefile: fix cleaning of tools in tests directory
Mans Rullgard [Tue, 25 Jan 2011 13:25:18 +0000 (13:25 +0000)]
Makefile: fix cleaning of tools in tests directory

The variable TESTPROGS is reset by the library makefiles,
use another name.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 3d157bf31f33cf413a6fb04ba69a4015ca0625cb)

8 years agoconfigure: move network tests before results are needed
Daniel Verkamp [Tue, 25 Jan 2011 09:28:01 +0000 (09:28 +0000)]
configure: move network tests before results are needed

This moves network_extralibs setup before use so that the link tests
for network functions work correctly.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 54fe299b885109556c72538977f9eefb969a0d87)

8 years agompegtsenc: remove unused variables
Georgi Chorbadzhiyski [Tue, 25 Jan 2011 10:58:31 +0000 (12:58 +0200)]
mpegtsenc: remove unused variables

Remove two variables that were not used and caused the following
warnings:

CC      libavformat/mpegtsenc.o
libavformat/mpegtsenc.c: In function 'mpegts_write_section':
libavformat/mpegtsenc.c:72:18: warning: unused variable 'ts'
libavformat/mpegtsenc.c: In function 'mpegts_insert_null_packet':
libavformat/mpegtsenc.c:586:18: warning: unused variable 'ts'

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6e78c8ee9420cc8e8899462b59e2305b4c056081)

8 years agoFix ALLPROGS_G so that *_g binaries get cleaned properly
Daniel Verkamp [Tue, 25 Jan 2011 07:58:18 +0000 (07:58 +0000)]
Fix ALLPROGS_G so that *_g binaries get cleaned properly

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 3adbe49f2b1a25d2fd44080167b6519c4ce4e30e)

8 years agolatm: remove superflous #includes
Mans Rullgard [Tue, 25 Jan 2011 03:31:01 +0000 (03:31 +0000)]
latm: remove superflous #includes

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e153e9a53a6fbfba974b8263bca70f7bba02952c)

8 years agoavidec: make print_tag() a macro and remove related ifdefs
Mans Rullgard [Tue, 25 Jan 2011 02:24:43 +0000 (02:24 +0000)]
avidec: make print_tag() a macro and remove related ifdefs

The dprintf macro is a no-op if DEBUG is not defined, so there
is no need to guard it here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6081f8c4e283bf1b33e4cf4b2ca44217219f9210)

8 years agoMake RTPFirstDynamicPayloadHandler static to rtpdec.c
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:18 +0000 (23:36 +0000)]
Make RTPFirstDynamicPayloadHandler static to rtpdec.c

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 119cc033fc88f4a7d6cc4ef6ee02097476e8f2a9)

8 years agoMake ff_realmedia_mp3_dynamic_handler static.
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:35 +0000 (01:29 +0000)]
Make ff_realmedia_mp3_dynamic_handler static.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 69ad22c7a7c2d961b413f96b437de267261311e2)

8 years agoMake denoise_dct_c() and dct_quantize_trellis_c() static in definitions
Mans Rullgard [Tue, 25 Jan 2011 01:02:19 +0000 (01:02 +0000)]
Make denoise_dct_c() and dct_quantize_trellis_c() static in definitions

1d4da6a460d5b78026e3b854fdd6f469957a054c added static to the
prototypes for these fuctions.  Adding it to the definitions
as well.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aa61e39eac85e26bff0f296b1ec86d4533664adc)

8 years agoDon't declare a pcm_dvd encoder.
Diego Elio Pettenò [Tue, 25 Jan 2011 00:41:24 +0000 (00:41 +0000)]
Don't declare a pcm_dvd encoder.

The PCM_DVD encoder would be left unused, as allcodecs.c properly declared
it as being decoder-only, but it would still be built into the object file.

Since there is no block of code to properly encode this PCM format, it's
not a full codec.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 5b5083b5fed1e0b0d8f3c6f2c21bdc915b1226f6)

8 years agoDon't check for DEBUG before using dprintf.
Diego Elio 'Flameeyes' Pettenò [Tue, 25 Jan 2011 00:16:36 +0000 (00:16 +0000)]
Don't check for DEBUG before using dprintf.

The dprintf macro is no-op when DEBUG is unset, so there is no need to
put it conditional to DEBUG.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 73a0b19ba39a4aca79a768feeacd83307a62836e)