| Commit message (Collapse) | Author | Age |
... | |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Currently (since the data_offset fix) the ogg demuxer assumes that
after the first non-header packets in any stream no more header packets
will follow.
This is not guaranteed, so change the code back again to wait until it
has finished the headers for all streams before returning from ogg_get_headers.
This fixes issue 2428.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6bd69e6adadf645fd07e909bebc150eab4b9c3c8)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This validate the length of a mkv element directly after reading
it.
This has the advantage that it is easy to add new limits and makes
it less likely to forget to add checks and also avoids issues like
bits of the length value above the first 32 being ignored because
the parsing functions only takes an int.
Previously discussed in the "mkv 0-byte integer parsing" thread.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 95ec3d4cacd084e2448c3a1aba420e7d8f00e19b)
|
|
|
|
|
|
| |
Change int64_t into a int, which caused this compiler warning:
libavformat/oggparseskeleton.c:64: warning: passing argument 2 of ‘av_reduce’ from incompatible pointer type
(cherry picked from commit 69ff14920429c9e128a8bcf65ce3f4b4aa93f3d1)
|
|
|
|
|
|
|
|
|
|
|
| |
Use avio functions instead of bytestream ones (also drops dependency on
lavc and removes a bunch of warnings).
Drop custom version of avio_get_str16 and use that instead.
Tested on mewmew-ssa.avi sample.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 47fdf00a77e82a0e30422ed08d5b295e9ae8d506)
|
|
|
|
|
| |
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 19711af5cdc364f9e02ea8103dd6e1e09dc288a4)
|
|
|
|
|
|
|
| |
Fixes issue 2475.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b3190529dfefe3226302b23e76e16c631cde6649)
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
| |
(cherry picked from commit efdd67cb00ad770c16c47161c023121e1ae53ae9)
|
|
|
|
|
| |
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c2fcd0a7a4d0bda1a3306e40b70ce281a987df60)
|
|
|
|
|
|
| |
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ad3cffb68f9c77e140660a8ae7d43c8606208178)
|
|
|
|
|
|
| |
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 90441276e4f661c6aec5e4d2c5718cde1ff1946d)
|
|
|
|
|
|
| |
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit fe174fc8fc4bbdb050014a945de7eb9b28ba358e)
|
|
|
|
|
| |
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 5a6de4e7e8d81169be9b6909b71e42a9ece59a82)
|
|
|
|
|
| |
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 74571e333cc9abf3fe3fde3735698def1547db71)
|
|
|
|
|
|
|
|
|
| |
as this method is unreliable
This fixes roundup issue 2556.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e4f85b849913794395bb03dfc09546cd41b10882)
|
|
|
|
|
|
|
| |
This fixes roundup issue 2583.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 185a155e5701cfaa0281bf91a5a140d498aa0a7f)
|
|
|
|
|
| |
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 5306bf41a619cb757ef0e0092ea4f6bc1087e687)
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
| |
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b22dbb291d41e9fb038884bcebad2394c501cbaf)
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
| |
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 290849e2a4e76484f1a34506782e8dbfe7bbe406)
|
|
|
|
|
| |
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e6fb5a4f78a67ed815e39ba8ac3893fd631b9b1a)
|
|
|
|
|
|
| |
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 51b317d2e921f489de7fb72a7f5f05d3039fa1cb)
|
|
|
|
|
| |
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit f61dee2fe4bc6a614079f37c25af1f92e90bc35b)
|
| |
|
|
|
|
|
| |
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit a9d921cbad7ec7e88bdb81b046faa9c1c6ac6d3d)
|
|
|
|
|
|
|
| |
Tested to compile with lavc major bump.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit b2ed95ec48aceb21a9bb47af85d259ee52b8b7ea)
|
|
|
|
|
|
|
| |
This fixes yet another memory leak, present since SVN rev 25418.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 1f56f5ed6d68f6492e213944e145e04e4d4dca13)
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
| |
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e65b1934bf4f2fbde611b75ea6c0c871daaf0b56)
|
|
|
|
|
| |
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aa42cce57ddf34b4e2c365859206eb52e2415ff5)
|
|
|
|
|
| |
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 437fb1c87d7b4b0730db97d0858b4f39fffff2a9)
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
This plugs a small memory leak
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit ea7f080749d68a431226ce196014da38761a0d82)
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
| |
2ff4a2764e5ea74c85b4231bc110540278cf3708
|
| |
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
| |
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22e9277aa5e6e5abfd037420093439058d4a14df)
|
|
|
|
|
| |
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 45430099438d7b4f70ebb23611a29d318ba49687)
|
|
|
|
|
|
| |
Signed-off-by: Vasyl' Vavrychuk <vvavrychuk@gmail.com>
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 665132e6204766b1d43ce413d6b1cc2a1d34ea29)
|
|
|
|
|
| |
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb29e4b9f2fdb97036eb7d5c38ae4bd4)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
$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)
|
|
|
|
|
|
|
| |
fix compile on OS/2
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit a0788cc6273a7a33cc111f7248248c71fd009916)
|
|
|
|
|
| |
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 042950542d6ee70fde01e4edbb6e6da38ebbaf27)
|
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|