ffmpeg.git
8 years agolavf: move internal functions from avformat.h to internal.h
Anton Khirnov [Sun, 6 Feb 2011 14:38:55 +0000 (15:38 +0100)]
lavf: move internal functions from avformat.h to internal.h

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

8 years agoMake av_set_pts_info keep previous time base if new one is invalid.
Reimar Döffinger [Sun, 6 Feb 2011 14:27:30 +0000 (15:27 +0100)]
Make av_set_pts_info keep previous time base if new one is invalid.

Fixes issue 2475.

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

8 years agopass QDMC extradata to the decoder
Sascha Sommer [Sun, 6 Feb 2011 12:54:03 +0000 (13:54 +0100)]
pass QDMC extradata to the decoder

Makes playing QDMC files in MPlayer work when using the libavformat demuxer.
Problem was that the extradata was not passed from demuxer to decoder.

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

8 years agoconfigure: check yasm/nasm for working pextrd opcode
Anssi Hannula [Sun, 6 Feb 2011 05:58:02 +0000 (07:58 +0200)]
configure: check yasm/nasm for working pextrd opcode

NASM versions older than 2.08 fail to build ffmpeg with several
"error: operation size not specified" errors but this is not caught in
configure.

Fix that by checking if "pextrd [eax], xmm0, 1" works in configure.

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

8 years agovorbis dec: Remove obsolete comment
Alexander Strasser [Mon, 7 Feb 2011 23:09:48 +0000 (00:09 +0100)]
vorbis dec: Remove obsolete comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovorbis dec: cosmetics: Indent CPP cond properly
Alexander Strasser [Mon, 7 Feb 2011 23:09:34 +0000 (00:09 +0100)]
vorbis dec: cosmetics: Indent CPP cond properly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovorbis dec: cosmetics: Indent consistently
Alexander Strasser [Mon, 7 Feb 2011 23:09:01 +0000 (00:09 +0100)]
vorbis dec: cosmetics: Indent consistently

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovorbis dec: cosmetics: Indent after scope deletion
Alexander Strasser [Mon, 7 Feb 2011 23:08:39 +0000 (00:08 +0100)]
vorbis dec: cosmetics: Indent after scope deletion

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovorbis dec: Delete useless scopes
Alexander Strasser [Mon, 7 Feb 2011 23:07:47 +0000 (00:07 +0100)]
vorbis dec: Delete useless scopes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoImplement guessed_pts in avcodec_decode_video2
Nicolas George [Sun, 30 Jan 2011 19:18:31 +0000 (20:18 +0100)]
Implement guessed_pts in avcodec_decode_video2

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodvdsubdec.c: prevent input buffer overflow
Jindrich Makovicka [Sat, 5 Feb 2011 10:39:51 +0000 (11:39 +0100)]
dvdsubdec.c: prevent input buffer overflow

In some places, dvbsubdec passes improper input buffer size to
bitstream reading functions, not accounting for reading pointer
updates.

Fixed by using buffer_end - buffer pointer instead of fixed buffer length.

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMake inter_rvlc and intra_rvlc static tables.
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:19 +0000 (00:36 +0100)]
Make inter_rvlc and intra_rvlc static tables.

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

8 years agoFill in missing date.
Ronald S. Bultje [Sun, 6 Feb 2011 14:46:32 +0000 (09:46 -0500)]
Fill in missing date.
(cherry picked from commit ae0f8a1a33158397c5014745424389ba1f543cfd)

8 years agoUpdate MINOR and set git rev for non-blocking flag API addition.
Ronald S. Bultje [Sun, 6 Feb 2011 14:19:34 +0000 (09:19 -0500)]
Update MINOR and set git rev for non-blocking flag API addition.
(cherry picked from commit efdd67cb00ad770c16c47161c023121e1ae53ae9)

8 years agoReplace remaining occurrences of deprecated CH_* with AV_CH_*
Anton Khirnov [Thu, 3 Feb 2011 13:26:09 +0000 (14:26 +0100)]
Replace remaining occurrences of deprecated CH_* with AV_CH_*

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

8 years agoNon-blocking protocol: TCP
Nicolas George [Fri, 4 Feb 2011 18:12:38 +0000 (19:12 +0100)]
Non-blocking protocol: TCP

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

8 years agoNon-blocking protocol: core wrapper functions
Nicolas George [Fri, 4 Feb 2011 18:12:37 +0000 (19:12 +0100)]
Non-blocking protocol: core wrapper functions

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

8 years agoNon-blocking protocols: flag and documentation
Nicolas George [Fri, 4 Feb 2011 18:12:36 +0000 (19:12 +0100)]
Non-blocking protocols: flag and documentation

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

8 years agoSet channel_layout for mpegaudio
Kieran Kunhya [Sat, 5 Feb 2011 17:59:48 +0000 (17:59 +0000)]
Set channel_layout for mpegaudio

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

8 years agomp3enc: write ISO8859-1 instead of UTF-16 when possible
Anton Khirnov [Sat, 5 Feb 2011 21:20:13 +0000 (22:20 +0100)]
mp3enc: write ISO8859-1 instead of UTF-16 when possible

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

8 years agoreindent after last commit
Peter Ross [Sat, 5 Feb 2011 01:10:32 +0000 (12:10 +1100)]
reindent after last commit

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

8 years agowtv: do not use flag in stream_guid chunk to determine if stream is valid, as this...
Peter Ross [Sat, 5 Feb 2011 01:10:10 +0000 (12:10 +1100)]
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 <rsbultje@gmail.com>
(cherry picked from commit e4f85b849913794395bb03dfc09546cd41b10882)

8 years agovp3: Move table allocation code into a new function
Alexander Strange [Sat, 5 Feb 2011 05:28:28 +0000 (00:28 -0500)]
vp3: Move table allocation code into a new function

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

8 years agovp3: Factor out expression
Alexander Strange [Sat, 5 Feb 2011 05:28:27 +0000 (00:28 -0500)]
vp3: Factor out expression

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

8 years agocmdutils: fix codec-specific options from preset
James Zern [Sat, 5 Feb 2011 02:29:46 +0000 (18:29 -0800)]
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 <rsbultje@gmail.com>
(cherry picked from commit 60ff9de6ffa740e0df8c2a019c72e2d332b9788d)

8 years agocmdutils: fix opt_values leak
James Zern [Sat, 5 Feb 2011 01:58:03 +0000 (17:58 -0800)]
cmdutils: fix opt_values leak

Add free to uninit_opts and relocate opt_names to same

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

8 years agoAdopt pkt_dts/pkt_pts in lavc clients
Alexander Strange [Sat, 5 Feb 2011 05:28:24 +0000 (00:28 -0500)]
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 <rsbultje@gmail.com>
(cherry picked from commit 6b474953975fd8ea64d1ed4d09c42b2d8e787c6f)

8 years agoapplehttp: Handle absolute paths relative to the current server
Martin Storsjö [Fri, 4 Feb 2011 09:09:48 +0000 (11:09 +0200)]
applehttp: Handle absolute paths relative to the current server

This fixes roundup issue 2583.

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

8 years agomovenchint: Use rtpenc_chain for setting up the chained RTP muxer
Martin Storsjö [Fri, 4 Feb 2011 10:04:20 +0000 (12:04 +0200)]
movenchint: Use rtpenc_chain for setting up the chained RTP muxer

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

8 years agortpenc_chain: Don't copy the time_base back to the caller
Martin Storsjö [Fri, 4 Feb 2011 10:04:19 +0000 (12:04 +0200)]
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.

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

8 years agoUse avformat_free_context for cleaning up muxers
Martin Storsjö [Fri, 4 Feb 2011 10:04:18 +0000 (12:04 +0200)]
Use avformat_free_context for cleaning up muxers

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

8 years agoAdd an APIchanges entry for avformat_free_context
Martin Storsjö [Fri, 4 Feb 2011 10:04:17 +0000 (12:04 +0200)]
Add an APIchanges entry for avformat_free_context

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

8 years agolibavformat: Add a function for freeing an AVFormatContext
Martin Storsjö [Fri, 4 Feb 2011 10:04:16 +0000 (12:04 +0200)]
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 <rsbultje@gmail.com>
(cherry picked from commit f124b087eea442b65d809582527dfb5092a3463c)

8 years agolibavformat: Use avcodec_copy_context for chained muxers
Martin Storsjö [Fri, 4 Feb 2011 10:04:15 +0000 (12:04 +0200)]
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.

This avoids having to manually unlink the chained AVStream->codec
by setting it to null before freeing the chained muxer via generic
freeing functions.

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

8 years agoVP8: slightly faster loopfilter sharpness logic
Jason Garrett-Glaser [Fri, 4 Feb 2011 07:37:30 +0000 (23:37 -0800)]
VP8: slightly faster loopfilter sharpness logic
(cherry picked from commit 8a2c99b48688008dd0a01c4826161ad4f7c25436)

8 years agoVP8: faster deblock strength calculation
Jason Garrett-Glaser [Fri, 4 Feb 2011 06:48:53 +0000 (22:48 -0800)]
VP8: faster deblock strength calculation

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

8 years agoRemove forgotten if (p) av_free(p) forms
Clément Bœsch [Thu, 3 Feb 2011 10:31:41 +0000 (11:31 +0100)]
Remove forgotten if (p) av_free(p) forms

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

8 years agoRemove a few if (p) av_freep(&p) forms
Clément Bœsch [Thu, 3 Feb 2011 10:30:17 +0000 (11:30 +0100)]
Remove a few if (p) av_freep(&p) forms

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

8 years agoVP8: faster filter_level clip
Jason Garrett-Glaser [Fri, 4 Feb 2011 03:44:32 +0000 (19:44 -0800)]
VP8: faster filter_level clip
(cherry picked from commit a1b227bb533f173354795124e0b966277c251b56)

8 years agoVP8: simplify lf_delta mb mode logic
Jason Garrett-Glaser [Fri, 4 Feb 2011 03:17:13 +0000 (19:17 -0800)]
VP8: simplify lf_delta mb mode logic
(cherry picked from commit dd18c9a050ac1f1437151ceb2d2afbc96c5602d8)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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)