Statistics
| Branch: | Revision:

ffmpeg @ 3ce3b498

# Date Author Comment
3ce3b498 02/06/2011 07:31 PM Nicolas George

Non-blocking protocol: core wrapper functions

Signed-off-by: Nicolas George <>
Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 90441276e4f661c6aec5e4d2c5718cde1ff1946d)

f4bd5800 02/06/2011 07:31 PM Nicolas George

Non-blocking protocols: flag and documentation

Signed-off-by: Nicolas George <>
Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit fe174fc8fc4bbdb050014a945de7eb9b28ba358e)

e10976eb 02/06/2011 07:31 PM Kieran Kunhya

Set channel_layout for mpegaudio

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit f4a86bc981d6743778dd1037fea243d36229ede1)

4a355654 02/06/2011 07:31 PM Anton Khirnov

mp3enc: write ISO8859-1 instead of UTF-16 when possible

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 5a6de4e7e8d81169be9b6909b71e42a9ece59a82)

9979dcd4 02/06/2011 07:31 PM Peter Ross

reindent after last commit

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 74571e333cc9abf3fe3fde3735698def1547db71)

699d55fb 02/06/2011 07:31 PM Peter Ross

wtv: do not use flag in stream_guid chunk to determine if stream is valid, as this method is unreliable

This fixes roundup issue 2556.

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit e4f85b849913794395bb03dfc09546cd41b10882)

3c90abf4 02/06/2011 07:31 PM Alexander Strange

vp3: Move table allocation code into a new function

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit edbb0c07081e78a4c7b6d999d641183bf30f1a2e)

dc4a1883 02/06/2011 07:31 PM Alexander Strange

vp3: Factor out expression

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit e8dcd730583a0aa69c33a17fc27d65fa55f5effe)

3f171f5a 02/06/2011 07:31 PM James Zern

cmdutils: fix codec-specific options from preset

Using a preset file caused the address of a stack variable to be stored
in opt_names/values. This change causes the strings to be dup'd then
freed in uninit_opts.

Signed-off-by: Ronald S. Bultje <>...

ba3517aa 02/06/2011 07:31 PM James Zern

cmdutils: fix opt_values leak

Add free to uninit_opts and relocate opt_names to same

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 3a6a9cdf5b8e4c4514e483484ef1f57b07ee16f2)

fd0ae17a 02/06/2011 07:31 PM Alexander Strange

Adopt pkt_dts/pkt_pts in lavc clients

No behavior change; this makes DTS reliable with the next patch.

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 6b474953975fd8ea64d1ed4d09c42b2d8e787c6f)

105ba7dc 02/06/2011 07:31 PM Martin Storsjö

applehttp: Handle absolute paths relative to the current server

This fixes roundup issue 2583.

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 185a155e5701cfaa0281bf91a5a140d498aa0a7f)

861aab56 02/06/2011 07:31 PM Martin Storsjö

movenchint: Use rtpenc_chain for setting up the chained RTP muxer

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 5306bf41a619cb757ef0e0092ea4f6bc1087e687)

118f0911 02/06/2011 07:31 PM Martin Storsjö

rtpenc_chain: Don't copy the time_base back to the caller

If required, the caller can do this itself. ff_write_chained rescales
timestamps as necessary, and all current callers of rtpenc_chain
use ff_write_chained, making this timebase copy unnecessary.
...

42f97696 02/06/2011 07:31 PM Martin Storsjö

Use avformat_free_context for cleaning up muxers

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit b22dbb291d41e9fb038884bcebad2394c501cbaf)

8cf2d3d3 02/06/2011 07:31 PM Martin Storsjö

Add an APIchanges entry for avformat_free_context

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit ff1974897778942180c1d4f95b0b7b45a4fbbc02)

4ed68fdf 02/06/2011 07:31 PM Martin Storsjö

libavformat: Add a function for freeing an AVFormatContext

This function is useful for freeing data structures allocated by
muxers, which currently have to be freed manually by the caller.

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit f124b087eea442b65d809582527dfb5092a3463c)

173f19be 02/06/2011 07:31 PM Martin Storsjö

libavformat: Use avcodec_copy_context for chained muxers

This avoids having the chained AVStream->codec point to the same
AVCodecContext owned by the outer AVStream. The downside is that
changes to the AVCodecContext made after calling av_write_header
cannot be detected automatically within the chained muxer....

e9266a2b 02/06/2011 07:31 PM Jason Garrett-Glaser

VP8: slightly faster loopfilter sharpness logic
(cherry picked from commit 8a2c99b48688008dd0a01c4826161ad4f7c25436)

9efa368f 02/06/2011 07:31 PM Jason Garrett-Glaser

VP8: faster deblock strength calculation

Convert hev_thresh logic to a LUT, simplify mbedge_lim calculation.
(cherry picked from commit 79dec1541bf83fb587aee9a002649ad1fe038990)

bffad70c 02/06/2011 07:31 PM Clément Bœsch

Remove forgotten if (p) av_free(p) forms

Signed-off-by: Mans Rullgard <>
(cherry picked from commit 290849e2a4e76484f1a34506782e8dbfe7bbe406)

b9004bd5 02/06/2011 07:31 PM Clément Bœsch

Remove a few if (p) av_freep(&p) forms

Signed-off-by: Mans Rullgard <>
(cherry picked from commit 523d9407d57e9210428b6d962f0ebf48aae55638)

c54ac7a8 02/06/2011 07:31 PM Jason Garrett-Glaser

VP8: faster filter_level clip
(cherry picked from commit a1b227bb533f173354795124e0b966277c251b56)

8cde1b79 02/06/2011 07:31 PM Jason Garrett-Glaser

VP8: simplify lf_delta mb mode logic
(cherry picked from commit dd18c9a050ac1f1437151ceb2d2afbc96c5602d8)

ab543afe 02/06/2011 07:31 PM Stefano Sabatini

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

c68be8e1 02/06/2011 07:31 PM Stefano Sabatini

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

2d9fd181 02/06/2011 07:31 PM Peter Ross

add ff_index_search_timestamp and ff_add_index_entry

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

566f17b6 02/06/2011 07:31 PM Nicolas George

TCP: factor the poll() call

Signed-off-by: Nicolas George <>
Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 51b317d2e921f489de7fb72a7f5f05d3039fa1cb)

d3c0de86 02/06/2011 07:31 PM Peter Ross

wtv: filesystem implementation

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

5603df39 02/05/2011 08:55 AM Reimar Döffinger

Always use av_set_pts_info to set the stream time base.

d947bce1 02/04/2011 02:10 AM Anton Khirnov

tty.c: rename PKT_FLAG_KEY to AV_PKT_FLAG_KEY.

Signed-off-by: Mans Rullgard <>
(cherry picked from commit a9d921cbad7ec7e88bdb81b046faa9c1c6ac6d3d)

7cb52584 02/04/2011 02:10 AM Anton Khirnov

Rename remaining occurrences of SAMPLE_FMT_* to AV_SAMPLE_FMT_*

Signed-off-by: Mans Rullgard <>
(cherry picked from commit 151595fe2e06969a83654564a15feb5b9e8aa2c4)

4d9c044d 02/04/2011 02:10 AM Anton Khirnov

Replace remaining occurrences of CODEC_TYPE_* with AVMEDIA_TYPE*

Tested to compile with lavc major bump.

Signed-off-by: Mans Rullgard <>
(cherry picked from commit b2ed95ec48aceb21a9bb47af85d259ee52b8b7ea)

a991b8de 02/04/2011 02:10 AM Martin Storsjö

sapenc: Free AVStream->info on cleanup

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

Signed-off-by: Mans Rullgard <>
(cherry picked from commit 1f56f5ed6d68f6492e213944e145e04e4d4dca13)

ea468763 02/04/2011 02:10 AM Anton Khirnov

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

b9dab113 02/04/2011 02:10 AM Tomas Härdin

Add ProRes FOURCCs to isom.c

Signed-off-by: Mans Rullgard <>
(cherry picked from commit e65b1934bf4f2fbde611b75ea6c0c871daaf0b56)

e3bf3d53 02/04/2011 02:10 AM Tomas Härdin

Add APIchanges entry for lavc 52.109.0

Signed-off-by: Mans Rullgard <>
(cherry picked from commit 75fd0668df64c4b7140be5ac829dee4e327a3e57)

6cd67b9f 02/04/2011 02:10 AM Tomas Härdin

Add CODEC_ID_PRORES and bump lavc minor version

Signed-off-by: Mans Rullgard <>
(cherry picked from commit f5b82f45dce8b734074a5e72e22ae42078ae9ce9)

d25d1d06 02/04/2011 02:10 AM Benjamin Larsson

Add AVC-Intra identifiers used by Flip4Mac for mov files

Signed-off-by: Mans Rullgard <>
(cherry picked from commit aa42cce57ddf34b4e2c365859206eb52e2415ff5)

e31a7441 02/04/2011 02:10 AM Clément Bœsch

Remove a few if (p) av_free(p) forms

Signed-off-by: Mans Rullgard <>
(cherry picked from commit 437fb1c87d7b4b0730db97d0858b4f39fffff2a9)

0c8eb72e 02/04/2011 02:10 AM Clément Bœsch

Avoid pointless check before calling free

Signed-off-by: Mans Rullgard <>
(cherry picked from commit dc75d6dbf2af3c03b33d3159e1dadccf22c076ea)

cf96cce7 02/04/2011 02:10 AM Nicolas George

Set pkt_pts in avcodec_default_reget_buffer()

This was missed when pkt_pts was first added.

Signed-off-by: Nicolas George <>
Signed-off-by: Mans Rullgard <>
(cherry picked from commit 62ecd3635a1329c49bc3b97ba84ad4d53d847163)

d0d8a9b1 02/04/2011 02:10 AM Martin Storsjö

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 <>
(cherry picked from commit ce41c51b0c71c87f623914ba0786aef325d818fe)

c6347bdf 02/04/2011 02:10 AM Martin Storsjö

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

4a908866 02/04/2011 02:10 AM Anton Khirnov

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 <>
(cherry picked from commit 87e4d9b252bc6fa3b982f7050013069c9dc3e05b)

e921bd57 02/04/2011 02:09 AM Anton Khirnov

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

10030226 02/04/2011 02:08 AM Justin Ruggles

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

057f3d27 02/04/2011 02:08 AM Stefano Sabatini

Log debug information in filter_samples().

Signed-off-by: Mans Rullgard <>
(cherry picked from commit 5fce60c3a9fbb21e580bad9165bf19d86ee7d96f)

8904a0f1 02/04/2011 02:08 AM Stefano Sabatini

ffplay: factorize code from video_thread() into configure_video_filters()

Signed-off-by: Mans Rullgard <>
(cherry picked from commit 75ea596de1145878a7603d5a3f269a9aac9ae30e)

01b75fa9 02/04/2011 02:08 AM Mans Rullgard

ARM: add helper macro for declaring constant data

Signed-off-by: Mans Rullgard <>
(cherry picked from commit b9a639ddd6e102edbf94a26b5106386792e2e4c8)

fe2ff6d2 02/04/2011 02:08 AM Justin Ruggles

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 <>
(cherry picked from commit c73d99e672329c8f2df290736ffc474c360ac4ae)

a35d782d 02/04/2011 02:08 AM Alex Converse

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 <>
(cherry picked from commit 770c410fbb8e1b87ce8ad7f3d7eddaa55e2b8295)

2aaa2a17 02/02/2011 02:40 AM Luca Barbato

Free the RTSPStreams in ff_rtsp_close_streams

This plugs a small memory leak

Signed-off-by: Janne Grunau <>
(cherry picked from commit ea7f080749d68a431226ce196014da38761a0d82)

45eaec30 02/02/2011 02:40 AM Anssi Hannula

h264: add profile names for the existing defines

Signed-off-by: Janne Grunau <>
(cherry picked from commit 71e0bee9eabe8eea030e210f1ad74c380b8b250b)

94e3e83f 02/02/2011 02:40 AM Janne Grunau

h264: Add Intra and Constrained Baseline profiles to avctx.profile
(cherry picked from commit fe9a3fbe42ebe5debd57550313ed4c3a065f1770)

8a92ec71 02/02/2011 02:40 AM Gianluigi Tiesi

dca: avoid C99 declaration in for() expression

Signed-off-by: Mans Rullgard <>
(cherry picked from commit e86e858111501650bb9ce8e39282e20c57bac913)

10ed02eb 02/02/2011 02:40 AM Mans Rullgard

Makefile: remove unused variable ALLHTMLPAGES

Signed-off-by: Mans Rullgard <>
(cherry picked from commit f3619680a7b14415479376b2c35a481c8f43927e)

850e9c6d 02/02/2011 02:40 AM Mans Rullgard

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

5ad4335c 02/02/2011 02:40 AM Jason Garrett-Glaser

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)

baffa091 02/02/2011 02:40 AM Ronald S. Bultje

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)

c0f88eed 02/02/2011 02:40 AM Mans Rullgard

Auto-generate dependencies for documentation

Signed-off-by: Mans Rullgard <>
(cherry picked from commit a0f9c8ce372c3943104672f8fd7ba2bcf9a5e157)

389b5bfa 02/02/2011 02:40 AM Justin Ruggles

cosmetics: indentation

Signed-off-by: Mans Rullgard <>
(cherry picked from commit d19b744a36987e1dd0c3239a2e1baa1e71d07a77)

a8ae4e0e 02/02/2011 02:40 AM Justin Ruggles

Remove unneeded add bias from 3 functions.

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

Signed-off-by: Mans Rullgard <>
(cherry picked from commit 80ba1ddb58b5923b9f36a6acd542affc4ca722eb)

403fa3cf 02/02/2011 02:40 AM Reimar Döffinger

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

e98b8e2f 02/02/2011 02:12 AM Stefano Sabatini

Implement av_samples_alloc() and av_samples_fill_arrays().

With minor changes by michael

Signed-off-by: Michael Niedermayer <>

40222b92 02/01/2011 11:19 AM Michael Niedermayer

Provide monotone revission numbers in version.sh

7b3ea550 01/31/2011 08:32 PM Michael Niedermayer

Add sample_aspect_ratio fields to vsrc_buffer arguments.
This fixes aspect handling in ffmpeg
This is based on a patch by baptiste

14b171cd 01/31/2011 08:32 PM Michael Niedermayer

Add sample_aspect_ratio to AVFilterLink

b482c001 01/31/2011 06:31 PM Reimar Döffinger

Remove pts rescaling code that is useless after 2ff4a2764e5ea74c85b4231bc110540278cf3708

12763671 01/31/2011 06:30 PM Reimar Döffinger

Document that av_write_header sets stream time_base to a value of it chosing.

2c30f7b3 01/31/2011 05:25 PM Mans Rullgard

mpegtsenc: fix PMT PID calculation

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

Signed-off-by: Mans Rullgard <>
(cherry picked from commit 740ad0d14d1eca7319a34866e896ad93cd65b9e9)

0374152f 01/31/2011 05:25 PM Mans Rullgard

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 <>
(cherry picked from commit 365e3c7878e4e821d5dec922d2d51f92ce13f926)

a735bbbb 01/31/2011 05:25 PM Georgi Chorbadzhiyski

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

29f22e04 01/31/2011 05:25 PM Stefano Sabatini

Add documentation for the image2 muxer.

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

2ff4a276 01/31/2011 05:25 PM Reimar Döffinger

VC1testenc: convert pts values to correct time-base.

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

939bfc87 01/31/2011 05:25 PM Ronald S. Bultje

asf/wtv: use service_provider and service_name metadata tags

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

5a8d1075 01/31/2011 05:25 PM Stefano Sabatini

Make ffmpeg warns the user when the selected sample format is ignored.

Signed-off-by: Mans Rullgard <>
(cherry picked from commit fa34a3626cf1aa19acbe9f8c6fcddb6c3eb8eaa1)

a4257d74 01/31/2011 05:25 PM Jason Garrett-Glaser

Slightly simplify VP8 inter_predict

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

2fa1d7b3 01/31/2011 05:25 PM Stefano Sabatini

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 <>
(cherry picked from commit 2855080447a226aba7e88e943fd8a8779d6daa98)

97b925ea 01/31/2011 05:25 PM Stefano Sabatini

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 <>
(cherry picked from commit 13156f40e1f17ec1d0c57e6bf7a2850f673600c0)

e5e3897b 01/31/2011 05:25 PM Vasyl' Vavrychuk

mpegts: remove get_pts duplicate of ff_parse_pes_pts.

Signed-off-by: Vasyl' Vavrychuk <>
Signed-off-by: Mans Rullgard <>
(cherry picked from commit 665132e6204766b1d43ce413d6b1cc2a1d34ea29)

9873463c 01/31/2011 05:25 PM Mans Rullgard

Enable native build on QNX/x86
(cherry picked from commit d33ed7b36762bf26694bdfa18e0d811e26c996f8)

9ef5a9de 01/30/2011 02:41 AM Luca Barbato

Replace dprintf with av_dlog

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

4592c85f 01/30/2011 02:41 AM Justin Ruggles

Flush final frames in libfaac encoder.

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

Signed-off-by: Mans Rullgard <>
(cherry picked from commit 243f8241dbf4a451e1197661ccd387c519ae3349)

5255acc6 01/30/2011 02:41 AM Vitor Sessak

Fix memory leak in ALS decoder in big endian systems

Signed-off-by: Mans Rullgard <>
(cherry picked from commit e0eb963aaa55ddcc54bf80f3261f6a436edca4a3)

451b4b86 01/30/2011 02:41 AM Mans Rullgard

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

5231d627 01/30/2011 02:41 AM Janne Grunau

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

bc0a603c 01/30/2011 02:41 AM Vitor Sessak

Fix overread in altivec DSP function sad16

Signed-off-by: Mans Rullgard <>
(cherry picked from commit 3af1fe829ee6db5eafe261947e74b8516ffe5188)

8afac88e 01/30/2011 02:41 AM Mans Rullgard

ARM: update MpegEncContext offsets
(cherry picked from commit 0745116c10e5650952c39ea543c66b12fba854e6)

d23e3e5f 01/30/2011 02:41 AM Ronald S. Bultje

Move ff_emulated_edge_mc() into DSPContext.
(cherry picked from commit 2e279598793133ee9c57fd0026d672f076fde4bf)

efcc1064 01/30/2011 02:41 AM Ronald S. Bultje

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)

59884f55 01/30/2011 02:41 AM Peter Ross

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

c053bba9 01/30/2011 02:41 AM Dave Yeo

rtspenc: include os_support.h for system without HAVE_POLL_H

fix compile on OS/2

Signed-off-by: Janne Grunau <>
(cherry picked from commit a0788cc6273a7a33cc111f7248248c71fd009916)

82704826 01/30/2011 02:41 AM Anton Khirnov

asfdec: ensure that the whole tag is read.

Signed-off-by: Janne Grunau <>
(cherry picked from commit 042950542d6ee70fde01e4edbb6e6da38ebbaf27)

13904b55 01/30/2011 02:41 AM Mans Rullgard

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

b5a7100a 01/30/2011 02:41 AM Stefano Sabatini

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 <>
(cherry picked from commit 4fc9ff0ad6f0f6b2c7443c6b4a3a1c817e97fdfd)

6aef89d5 01/30/2011 02:41 AM Mans Rullgard

Update mpegts test reference

The output was changed by a7827a17c6b3388322350456d445c94b3a82cd25.

Signed-off-by: Mans Rullgard <>
(cherry picked from commit 79dca23dc262742b312161a5dec707eb7b9c8d97)

79615a3e 01/30/2011 02:41 AM Alex Converse

aacdec: Convert some loop copies into memcpy()s.

Signed-off-by: Mans Rullgard <>
(cherry picked from commit e5c82df80ef49957fe532d0992985012d6d97955)

6219b67e 01/30/2011 02:41 AM Stefano Sabatini

Add muxers.texi file.

Signed-off-by: Janne Grunau <>
(cherry picked from commit 85466e1e5f7f1fe50933d2d967a06b45b9222b5b)

753134ae 01/30/2011 02:40 AM Georgi Chorbadzhiyski

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