ffmpeg.git
9 years agoMake avfilter_graph_free() free the graph.
Stefano Sabatini [Tue, 1 Feb 2011 19:02:17 +0000 (20:02 +0100)]
Make avfilter_graph_free() free the graph.

Make avfilter_graph_free() free not only the internal structures, but
also the allocated graph, and set the graph pointer to NULL for
increased safety.

Simplify usage.

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

9 years agoMake avfilter_graph_parse() not free the input graph
Stefano Sabatini [Tue, 1 Feb 2011 20:52:07 +0000 (21:52 +0100)]
Make avfilter_graph_parse() not free the input graph

Make avfilter_graph_parse() only release the internal structures
allocated during the parsing, and leave to free the graph itself to
the calling code.

This approach looks cleaner, as the graph is not allocated by the
function.

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

9 years agoadd ff_index_search_timestamp and ff_add_index_entry
Peter Ross [Sat, 22 Jan 2011 09:03:22 +0000 (20:03 +1100)]
add ff_index_search_timestamp and ff_add_index_entry

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

9 years agoTCP: factor the poll() call
Nicolas George [Wed, 2 Feb 2011 17:45:44 +0000 (18:45 +0100)]
TCP: factor the poll() call

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 51b317d2e921f489de7fb72a7f5f05d3039fa1cb)

9 years agowtv: filesystem implementation
Peter Ross [Sun, 23 Jan 2011 01:58:59 +0000 (12:58 +1100)]
wtv: filesystem implementation

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

9 years agoAlways use av_set_pts_info to set the stream time base.
Reimar Döffinger [Mon, 31 Jan 2011 19:08:56 +0000 (20:08 +0100)]
Always use av_set_pts_info to set the stream time base.

9 years agotty.c: rename PKT_FLAG_KEY to AV_PKT_FLAG_KEY.
Anton Khirnov [Thu, 3 Feb 2011 13:34:02 +0000 (13:34 +0000)]
tty.c: rename PKT_FLAG_KEY to AV_PKT_FLAG_KEY.

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

9 years agoRename remaining occurrences of SAMPLE_FMT_* to AV_SAMPLE_FMT_*
Anton Khirnov [Thu, 3 Feb 2011 13:34:01 +0000 (13:34 +0000)]
Rename remaining occurrences of SAMPLE_FMT_* to AV_SAMPLE_FMT_*

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

9 years agoReplace remaining occurrences of CODEC_TYPE_* with AVMEDIA_TYPE*
Anton Khirnov [Thu, 3 Feb 2011 13:34:00 +0000 (13:34 +0000)]
Replace remaining occurrences of CODEC_TYPE_* with AVMEDIA_TYPE*

Tested to compile with lavc major bump.

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

9 years agosapenc: Free AVStream->info on cleanup
Martin Storsjö [Thu, 3 Feb 2011 12:10:12 +0000 (12:10 +0000)]
sapenc: Free AVStream->info on cleanup

This fixes yet another memory leak, present since SVN rev 25418.

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

9 years agortmpproto: rename URLContext* argument in rtmp_write()
Anton Khirnov [Thu, 3 Feb 2011 11:17:35 +0000 (11:17 +0000)]
rtmpproto: rename URLContext* argument in rtmp_write()

Now the first argument is URLContext *h. However, the function logs to
LOG_CONTEXT, which is #defined as 's' for new lavf major versions.

Therefore, rename h -> s.

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

9 years agoAdd ProRes FOURCCs to isom.c
Tomas Härdin [Thu, 3 Feb 2011 09:50:50 +0000 (10:50 +0100)]
Add ProRes FOURCCs to isom.c

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

9 years agoAdd APIchanges entry for lavc 52.109.0
Tomas Härdin [Thu, 3 Feb 2011 11:00:02 +0000 (12:00 +0100)]
Add APIchanges entry for lavc 52.109.0

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

9 years agoAdd CODEC_ID_PRORES and bump lavc minor version
Tomas Härdin [Thu, 3 Feb 2011 09:47:48 +0000 (10:47 +0100)]
Add CODEC_ID_PRORES and bump lavc minor version

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

9 years agoAdd AVC-Intra identifiers used by Flip4Mac for mov files
Benjamin Larsson [Wed, 2 Feb 2011 13:03:46 +0000 (14:03 +0100)]
Add AVC-Intra identifiers used by Flip4Mac for mov files

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

9 years agoRemove a few if (p) av_free(p) forms
Clément Bœsch [Thu, 3 Feb 2011 01:09:36 +0000 (02:09 +0100)]
Remove a few if (p) av_free(p) forms

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

9 years agoAvoid pointless check before calling free
Clément Bœsch [Thu, 3 Feb 2011 00:40:35 +0000 (01:40 +0100)]
Avoid pointless check before calling free

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

9 years agoSet pkt_pts in avcodec_default_reget_buffer()
Nicolas George [Wed, 2 Feb 2011 20:54:14 +0000 (21:54 +0100)]
Set pkt_pts in avcodec_default_reget_buffer()

This was missed when pkt_pts was first added.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 62ecd3635a1329c49bc3b97ba84ad4d53d847163)

9 years agoFree AVStream->info in chained muxers
Martin Storsjö [Wed, 2 Feb 2011 08:57:26 +0000 (10:57 +0200)]
Free AVStream->info in chained muxers

This fixes memory leaks in the RTSP muxer and RTP hinting in the
mov muxer present since SVN rev 25418.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ce41c51b0c71c87f623914ba0786aef325d818fe)

9 years agortsp: Don't store RTSPStream in AVStream->priv_data
Martin Storsjö [Wed, 2 Feb 2011 09:08:01 +0000 (11:08 +0200)]
rtsp: Don't store RTSPStream in AVStream->priv_data

For mpegts in RTP, there isn't a direct mapping between RTSPStreams
and AVStreams, and the RTSPStream isn't ever stored in
AVStream->priv_data, which was earlier leaked. The fix for this
leak, in ea7f080749d68a431226ce196014da38761a0d82, lead to
double frees for other, normal RTP streams.

This patch avoids storing RTSPStreams in AVStream->priv_data, thus
avoiding the double free. The RTSPStreams are always available via
RTSPState->rtsp_streams anyway.

Tested with MS-RTSP, RealRTSP, DSS and mpegts/RTP.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit d9c0510e22821baa364306d867ffac45da0620c8)

9 years agoffmpeg.c: rename map_meta_data option to map_metadata
Anton Khirnov [Wed, 2 Feb 2011 20:45:16 +0000 (21:45 +0100)]
ffmpeg.c: rename map_meta_data option to map_metadata

It's consistent with the -metadata option and easier to write.

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

9 years agoAdd forgotten minor API bumps and APIChanges entries
Anton Khirnov [Wed, 2 Feb 2011 14:51:27 +0000 (15:51 +0100)]
Add forgotten minor API bumps and APIChanges entries

The bumps are for adding version.h and avio_{get/put}_str functions in
lavf and making av_dlog public in lavu.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
9 years agoac3enc: Change EXP_DIFF_THRESHOLD to 500.
Justin Ruggles [Wed, 2 Feb 2011 18:23:59 +0000 (18:23 +0000)]
ac3enc: Change EXP_DIFF_THRESHOLD to 500.

This patch changes the exponent difference threshold in the exponent
strategy decision function of the AC-3 encoder.  I tested lowering in
increments of 100.  From 1000 down to 500 generally increased in quality
with each step, but 400 was generally much worse.

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

9 years agoLog debug information in filter_samples().
Stefano Sabatini [Tue, 1 Feb 2011 15:48:37 +0000 (15:48 +0000)]
Log debug information in filter_samples().

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

9 years agoffplay: factorize code from video_thread() into configure_video_filters()
Stefano Sabatini [Tue, 1 Feb 2011 18:28:09 +0000 (18:28 +0000)]
ffplay: factorize code from video_thread() into configure_video_filters()

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

9 years agoARM: add helper macro for declaring constant data
Mans Rullgard [Wed, 26 Jan 2011 22:26:51 +0000 (22:26 +0000)]
ARM: add helper macro for declaring constant data

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

9 years agoSeparate format conversion DSP functions from DSPContext.
Justin Ruggles [Sun, 30 Jan 2011 15:06:46 +0000 (15:06 +0000)]
Separate format conversion DSP functions from DSPContext.

This will be beneficial for use with the audio conversion API without
requiring it to depend on all of dsputil.

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

9 years agoFix ff_imdct_calc_sse() on gcc-4.6
Alex Converse [Sun, 30 Jan 2011 09:04:41 +0000 (01:04 -0800)]
Fix ff_imdct_calc_sse() on gcc-4.6

Gcc 4.6 only preserves the first value when using an array with an "m"
constraint.

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

9 years agoFree the RTSPStreams in ff_rtsp_close_streams
Luca Barbato [Tue, 1 Feb 2011 19:09:24 +0000 (20:09 +0100)]
Free the RTSPStreams in ff_rtsp_close_streams

This plugs a small memory leak

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

9 years agoh264: add profile names for the existing defines
Anssi Hannula [Fri, 21 Jan 2011 22:58:52 +0000 (00:58 +0200)]
h264: add profile names for the existing defines

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

9 years agoh264: Add Intra and Constrained Baseline profiles to avctx.profile
Janne Grunau [Fri, 28 Jan 2011 21:15:47 +0000 (22:15 +0100)]
h264: Add Intra and Constrained Baseline profiles to avctx.profile
(cherry picked from commit fe9a3fbe42ebe5debd57550313ed4c3a065f1770)

9 years agodca: avoid C99 declaration in for() expression
Gianluigi Tiesi [Tue, 1 Feb 2011 04:12:26 +0000 (04:12 +0000)]
dca: avoid C99 declaration in for() expression

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

9 years agoMakefile: remove unused variable ALLHTMLPAGES
Mans Rullgard [Tue, 1 Feb 2011 02:24:20 +0000 (02:24 +0000)]
Makefile: remove unused variable ALLHTMLPAGES

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

9 years agoMakefile: build docs only for enabled tools; fix docs dependencies
Mans Rullgard [Tue, 1 Feb 2011 02:23:30 +0000 (02:23 +0000)]
Makefile: build docs only for enabled tools; fix docs dependencies

This makes "make documentation" build the man/html pages only for
the tools enabled in the build.  It also fixes the dependency
tracking for the built man pages.

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

9 years agoVP8: merge chroma MC calls
Jason Garrett-Glaser [Tue, 1 Feb 2011 03:04:29 +0000 (19:04 -0800)]
VP8: merge chroma MC calls

Adds some duplicated code, but avoids duplicate edge checks and similar.
~0.5% faster overall on Parkjoy test sample.
(cherry picked from commit 64233e702a95df9167e3362e58aae4e82ce2ddf8)

9 years agoImplement a SIMD version of emulated_edge_mc() for x86.
Ronald S. Bultje [Tue, 1 Feb 2011 01:55:56 +0000 (20:55 -0500)]
Implement a SIMD version of emulated_edge_mc() for x86.

From ~550 cycles (C version) to 170 (SSE/x86-64), 206 (MMX/x86-32)
and 196 (SSE2/x86-32) cycles.
(cherry picked from commit 81f2a3f4ffcc6935b8b8ada4954700b3f333ae4f)

9 years agoAuto-generate dependencies for documentation
Mans Rullgard [Mon, 31 Jan 2011 22:51:23 +0000 (22:51 +0000)]
Auto-generate dependencies for documentation

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

9 years agocosmetics: indentation
Justin Ruggles [Mon, 31 Jan 2011 19:26:03 +0000 (19:26 +0000)]
cosmetics: indentation

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

9 years agoRemove unneeded add bias from 3 functions.
Justin Ruggles [Mon, 31 Jan 2011 19:26:02 +0000 (19:26 +0000)]
Remove unneeded add bias from 3 functions.

DSPContext.vector_fmul_window()
DCADSPContext.lfe_fir()
SynthFilterContext.synth_filter_float()

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

9 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)

9 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>
9 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

9 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

9 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

9 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

9 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.

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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.

9 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().

9 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

9 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

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)

9 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)