generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
29,818 Commits 24 Branches 241 Tags 173 MiB
99e07a4453
Commit Graph

7637 Commits

Author SHA1 Message Date
Nicolas George
f4bd5800ac 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 fe174fc8fc)
 2011-02-06 20:31:46 +01:00
Anton Khirnov
4a3556542d mp3enc: write ISO8859-1 instead of UTF-16 when possible 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 5a6de4e7e8)
 2011-02-06 20:31:46 +01:00
Peter Ross
9979dcd40e reindent after last commit 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 74571e333c)
 2011-02-06 20:31:46 +01:00
Peter Ross
699d55fb12 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 e4f85b8499)
 2011-02-06 20:31:45 +01:00
Martin Storsjö
105ba7dc28 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 185a155e57)
 2011-02-06 20:31:45 +01:00
Martin Storsjö
861aab5677 movenchint: Use rtpenc_chain for setting up the chained RTP muxer 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 5306bf41a6)
 2011-02-06 20:31:45 +01:00
Martin Storsjö
118f09114c 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 397ffde115)
 2011-02-06 20:31:45 +01:00
Martin Storsjö
42f97696ae Use avformat_free_context for cleaning up muxers 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b22dbb291d)
 2011-02-06 20:31:45 +01:00
Martin Storsjö
4ed68fdfdc 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 f124b087ee)
 2011-02-06 20:31:44 +01:00
Martin Storsjö
173f19be75 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 1338dc0823)
 2011-02-06 20:31:44 +01:00
Clément Bœsch
bffad70c66 Remove forgotten if (p) av_free(p) forms 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 290849e2a4)
 2011-02-06 20:31:44 +01:00
Peter Ross
2d9fd1810b add ff_index_search_timestamp and ff_add_index_entry 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e6fb5a4f78)
 2011-02-06 20:31:42 +01:00
Nicolas George
566f17b62d 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 51b317d2e9)
 2011-02-06 20:31:42 +01:00
Peter Ross
d3c0de863d wtv: filesystem implementation 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit f61dee2fe4)
 2011-02-06 20:31:41 +01:00
Ronald S. Bultje
efdd67cb00 Update MINOR and set git rev for non-blocking flag API addition. 2011-02-06 09:19:34 -05:00
Anton Khirnov
c2fcd0a7a4 Replace remaining occurrences of deprecated CH_* with AV_CH_* 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-06 08:26:12 -05:00
Nicolas George
ad3cffb68f Non-blocking protocol: TCP 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-05 20:31:38 -05:00
Nicolas George
90441276e4 Non-blocking protocol: core wrapper functions 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-05 20:29:59 -05:00
Nicolas George
fe174fc8fc Non-blocking protocols: flag and documentation 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-05 20:28:04 -05:00
Anton Khirnov
5a6de4e7e8 mp3enc: write ISO8859-1 instead of UTF-16 when possible 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-05 20:13:48 -05:00
Peter Ross
74571e333c reindent after last commit 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-05 20:10:32 -05:00
Peter Ross
e4f85b8499 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>
 2011-02-05 20:09:56 -05:00
Reimar Döffinger
5603df39df Always use av_set_pts_info to set the stream time base. 2011-02-05 09:55:53 +01:00
Martin Storsjö
185a155e57 applehttp: Handle absolute paths relative to the current server 
This fixes roundup issue 2583.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-04 12:23:04 -05:00
Martin Storsjö
5306bf41a6 movenchint: Use rtpenc_chain for setting up the chained RTP muxer 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-04 11:42:54 -05:00
Martin Storsjö
397ffde115 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>
 2011-02-04 11:41:10 -05:00
Martin Storsjö
b22dbb291d Use avformat_free_context for cleaning up muxers 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-04 11:39:55 -05:00
Martin Storsjö
f124b087ee 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>
 2011-02-04 11:29:41 -05:00
Martin Storsjö
1338dc0823 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>
 2011-02-04 11:28:07 -05:00
Clément Bœsch
290849e2a4 Remove forgotten if (p) av_free(p) forms 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-04 10:00:52 +00:00
Peter Ross
e6fb5a4f78 add ff_index_search_timestamp and ff_add_index_entry 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-03 21:50:54 -05:00
Anton Khirnov
d947bce1fc tty.c: rename PKT_FLAG_KEY to AV_PKT_FLAG_KEY. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit a9d921cbad)
 2011-02-04 03:10:12 +01:00
Anton Khirnov
4d9c044d47 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 b2ed95ec48)
 2011-02-04 03:10:12 +01:00
Martin Storsjö
a991b8dec6 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 1f56f5ed6d)
 2011-02-04 03:10:12 +01:00
Anton Khirnov
ea46876301 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 9ad4c65f6f)
 2011-02-04 03:10:12 +01:00
Tomas Härdin
b9dab1131c Add ProRes FOURCCs to isom.c 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e65b1934bf)
 2011-02-04 03:10:11 +01:00
Benjamin Larsson
d25d1d06a4 Add AVC-Intra identifiers used by Flip4Mac for mov files 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aa42cce57d)
 2011-02-04 03:10:10 +01:00
Clément Bœsch
e31a744155 Remove a few if (p) av_free(p) forms 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 437fb1c87d)
 2011-02-04 03:10:10 +01:00
Martin Storsjö
d0d8a9b138 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 ce41c51b0c)
 2011-02-04 03:10:10 +01:00
Martin Storsjö
c6347bdf08 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 ea7f080749, 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 d9c0510e22)
 2011-02-04 03:10:10 +01:00
Anton Khirnov
e921bd57e3 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>
 2011-02-04 03:09:57 +01:00
Nicolas George
51b317d2e9 TCP: factor the poll() call 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-03 20:58:32 -05:00
Peter Ross
f61dee2fe4 wtv: filesystem implementation 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-03 20:55:42 -05:00
Anton Khirnov
a9d921cbad tty.c: rename PKT_FLAG_KEY to AV_PKT_FLAG_KEY. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-03 13:41:08 +00:00
Anton Khirnov
b2ed95ec48 Replace remaining occurrences of CODEC_TYPE_* with AVMEDIA_TYPE* 
Tested to compile with lavc major bump.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-03 13:37:09 +00:00
Martin Storsjö
1f56f5ed6d 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>
 2011-02-03 13:21:36 +00:00
Anton Khirnov
9ad4c65f6f 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>
 2011-02-03 11:43:48 +00:00
Tomas Härdin
e65b1934bf Add ProRes FOURCCs to isom.c 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-03 11:40:56 +00:00
Benjamin Larsson
aa42cce57d Add AVC-Intra identifiers used by Flip4Mac for mov files 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-03 10:21:44 +00:00
Clément Bœsch
437fb1c87d Remove a few if (p) av_free(p) forms 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-03 01:37:55 +00:00
Martin Storsjö
ce41c51b0c 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>
 2011-02-03 01:03:31 +01:00
Martin Storsjö
d9c0510e22 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 ea7f080749, 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>
 2011-02-03 00:49:15 +01:00
Anton Khirnov
4868bebe5b 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>
 2011-02-02 22:42:39 +01:00
Luca Barbato
2aaa2a1700 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 ea7f080749)
 2011-02-02 03:40:50 +01:00
Reimar Döffinger
403fa3cf07 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 8cb3c557a9)
 2011-02-02 03:40:48 +01:00
Luca Barbato
ea7f080749 Free the RTSPStreams in ff_rtsp_close_streams 
This plugs a small memory leak

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-02-01 20:40:16 +01:00
Reimar Döffinger
8cb3c557a9 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>
 2011-01-31 20:21:26 +00:00
Reimar Döffinger
b482c00121 Remove pts rescaling code that is useless after 2ff4a2764e 2011-01-31 19:31:04 +01:00
Reimar Döffinger
12763671e2 Document that av_write_header sets stream time_base to a value of it chosing. 2011-01-31 19:30:49 +01:00
Mans Rullgard
2c30f7b3d7 mpegtsenc: fix PMT PID calculation 
445996aa51 caused the PMT PID to be
off by one.  This corrects it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 740ad0d14d)
 2011-01-31 18:25:48 +01:00
Georgi Chorbadzhiyski
a735bbbb7a 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 445996aa51)
 2011-01-31 18:25:47 +01:00
Reimar Döffinger
2ff4a2764e VC1testenc: convert pts values to correct time-base. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22e9277aa5)
 2011-01-31 18:25:47 +01:00
Ronald S. Bultje
939bfc87ee asf/wtv: use service_provider and service_name metadata tags 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 4543009943)
 2011-01-31 18:25:47 +01:00
Vasyl' Vavrychuk
e5e3897b64 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 665132e620)
 2011-01-31 18:25:44 +01:00
Mans Rullgard
740ad0d14d mpegtsenc: fix PMT PID calculation 
445996aa51 caused the PMT PID to be
off by one.  This corrects it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-31 16:58:23 +00:00
Georgi Chorbadzhiyski
445996aa51 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>
 2011-01-31 10:42:13 -05:00
Reimar Döffinger
22e9277aa5 VC1testenc: convert pts values to correct time-base. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-01-31 09:25:18 -05:00
Ronald S. Bultje
4543009943 asf/wtv: use service_provider and service_name metadata tags 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-01-31 08:58:33 -05:00
Vasyl' Vavrychuk
665132e620 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>
 2011-01-30 16:39:27 +00:00
Luca Barbato
9ef5a9deaf Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb)
 2011-01-30 03:41:48 +01:00
Peter Ross
59884f55d1 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 4d54df8e07)
 2011-01-30 03:41:00 +01:00
Dave Yeo
c053bba9e2 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 a0788cc627)
 2011-01-30 03:41:00 +01:00
Anton Khirnov
8270482681 asfdec: ensure that the whole tag is read. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 042950542d)
 2011-01-30 03:41:00 +01:00
Mans Rullgard
13904b552b 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 a8475bbdb6.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 362d8f7d9e)
 2011-01-30 03:41:00 +01:00
Stefano Sabatini
b5a7100ad3 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 4fc9ff0ad6)
 2011-01-30 03:41:00 +01:00
Georgi Chorbadzhiyski
753134ae3e 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 a7827a17c6)
 2011-01-30 03:40:59 +01:00
Luca Barbato
b351baa070 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 f81c7ac70a)
 2011-01-30 03:40:59 +01:00
Luca Barbato
d0eb91ad04 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 a8475bbdb6)
 2011-01-30 03:40:59 +01:00
Diego Elio Pettenò
9740a357e9 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 e628864033)
 2011-01-30 03:40:58 +01:00
Luca Barbato
dfd2a005eb Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
 2011-01-29 23:55:37 +01:00
Reimar Döffinger
ce20edb7bd 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

This is a quick fix for a crash, not a final solution.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-29 13:48:13 +00:00
Reimar Döffinger
76c802e989 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.
 2011-01-29 11:56:25 +01:00
Peter Ross
4d54df8e07 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>
 2011-01-28 22:33:57 +00:00
Dave Yeo
a0788cc627 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>
 2011-01-28 21:41:12 +01:00
Anton Khirnov
042950542d asfdec: ensure that the whole tag is read. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-28 21:33:45 +01:00
Reimar Döffinger
609bdf813d 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
 2011-01-28 20:58:57 +01:00
Mans Rullgard
362d8f7d9e 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 a8475bbdb6.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-28 17:23:19 +00:00
Stefano Sabatini
4fc9ff0ad6 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>
 2011-01-28 18:04:33 +01:00
Georgi Chorbadzhiyski
a7827a17c6 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>
 2011-01-28 17:46:36 +01:00
Luca Barbato
f81c7ac70a 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
 2011-01-28 15:45:19 +01:00
Luca Barbato
a8475bbdb6 os: replace select with poll 
Select has limitations on the fd values it could accept and silently
breaks when it is reached.
 2011-01-28 15:45:19 +01:00
John Stebbins
2f7d8977bc mov: add support for little-endian utf16 chapter names 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 97b04f5ed3)
 2011-01-28 03:15:35 +01:00
Janne Grunau
9653e754a4 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 795ed278e6)
 2011-01-28 03:15:35 +01:00
Diego Elio Pettenò
66355be3c3 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 c6610a216e)
 2011-01-28 03:15:34 +01:00
Anton Khirnov
ebf3ee16c7 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 225b6d7fde)
 2011-01-28 03:15:34 +01:00
Mans Rullgard
bc1aebcd07 Revert "mov: simplify mov_read_chapters() by using avio_get_str16be" 
This reverts commit c34461b35b.
The wrong version of the patch was committed.
(cherry picked from commit c4f8765ac5)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
4b21c38180 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 2d162e3825)
 2011-01-28 03:15:33 +01:00
Georgi Chorbadzhiyski
4c9bfe3e4e mpegtsenc: set reserved bits to 1 in PCR field 
The reserved bits between PCR base and extension fields must be
set to 1.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 535638b55f)
 2011-01-28 03:15:32 +01:00
Diego Elio Pettenò
e628864033 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>
 2011-01-28 01:45:17 +00:00
John Stebbins
97b04f5ed3 mov: add support for little-endian utf16 chapter names 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-28 01:06:57 +01:00
Janne Grunau
795ed278e6 movenc: byteswap codec_tag in mov_write_ms_tag 
based on Alex Converse's "Fix ADPCM MS in mov muxing" patch
 2011-01-28 01:06:57 +01:00
Baptiste Coudurier
f258964217 In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it 
In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-28 01:06:57 +01:00
Diego Elio Pettenò
c6610a216e 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.
 2011-01-26 22:10:09 +00:00
Anton Khirnov
225b6d7fde 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>
 2011-01-26 22:03:21 +00:00
Mans Rullgard
c4f8765ac5 Revert "mov: simplify mov_read_chapters() by using avio_get_str16be" 
This reverts commit c34461b35b.
The wrong version of the patch was committed.
 2011-01-26 22:03:21 +00:00
Diego Elio Pettenò
2d162e3825 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>
 2011-01-26 16:08:04 +00:00
Diego Elio Pettenò
3d21b4f607 Make ff_rtsp_send_cmd_with_content_async static to rtsp.c. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 57c4d01ec9)
 2011-01-26 03:43:32 +01:00
Diego Elio Pettenò
c940ed4254 Make ff_mxf_pixel_layouts static to mxf.c. 
Also make it an anonymous structure as never it is accessed by name.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit a3dffc0627)
 2011-01-26 03:43:32 +01:00
Diego Elio Pettenò
d20d1449e0 Make ff_interleave_compare_dts static to utils.c. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 101e1f6ff9)
 2011-01-26 03:43:31 +01:00
Anton Khirnov
0c468f5684 mov: simplify mov_read_chapters() by using avio_get_str16be 
It probably also fixes a memleak or two.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit c34461b35b)
 2011-01-26 03:43:31 +01:00
Anton Khirnov
24519edf64 asfdec: remove some commented-out cruft 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 2934cd9dbf)
 2011-01-26 03:43:31 +01:00
Anton Khirnov
f9d6b13a23 lavf: make a variant of ff_get_str16_nolen public 
It will be useful in mp3 demuxer and hopeful some other places.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 93b78d1210)
 2011-01-26 03:43:31 +01:00
Jai Menon
c481ff1029 ffmetaenc: Use correct format specifiers. 
Use printf format macros from inttypes.h.
Additionally, this fixes a warning when building with clang.
(cherry picked from commit c0ae5152d1)
 2011-01-26 03:43:31 +01:00
Mans Rullgard
8fa28af965 tty: remove superflous #include <strings.h> 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 1e48cdaac3)
 2011-01-26 03:43:30 +01:00
Georgi Chorbadzhiyski
4fee6f32e2 mpegtsenc: remove unused variables 
Remove two variables that were not used and caused the following
warnings:

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

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6e78c8ee94)
 2011-01-26 03:43:30 +01:00
Mans Rullgard
3e8c4f9689 avidec: make print_tag() a macro and remove related ifdefs 
The dprintf macro is a no-op if DEBUG is not defined, so there
is no need to guard it here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6081f8c4e2)
 2011-01-26 03:43:30 +01:00
Diego Elio Pettenò
53d3f66bae Make RTPFirstDynamicPayloadHandler static to rtpdec.c 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 119cc033fc)
 2011-01-26 03:43:30 +01:00
Diego Elio Pettenò
c2ec089c5a Make ff_realmedia_mp3_dynamic_handler static. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 69ad22c7a7)
 2011-01-26 03:43:30 +01:00
Diego Elio 'Flameeyes' Pettenò
463532310a Don't check for DEBUG before using dprintf. 
The dprintf macro is no-op when DEBUG is unset, so there is no need to
put it conditional to DEBUG.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 73a0b19ba3)
 2011-01-26 03:43:29 +01:00
Diego Elio Pettenò
81c38db13c Make dvenc.c functions static to the unit. 
Also drop some CONFIG_DV_MUXER #ifdefs probably vestigial from before the
split of dvenc and dvdec.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f0a8676958)
 2011-01-26 03:43:29 +01:00
Martin Storsjö
4f40ec0552 rtspdec: Retry with TCP if UDP failed 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 2762a7a28b)
 2011-01-26 03:43:29 +01:00
Martin Storsjo
2afd30bf7a rtspdec: Move rtsp_read_pause up, next to rtsp_read_play 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit e836b1b085)
 2011-01-26 03:43:28 +01:00
Martin Storsjo
3f44e3c91a rtsp: Use ff_rtsp_undo_setup in the cleanup code in ff_rtsp_make_request 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit aeb2de1c82)
 2011-01-26 03:43:28 +01:00
Martin Storsjo
abbc1d272e rtsp: Split out a function undoing the setup made by ff_rtsp_make_setup_request 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 93e7490ee0)
 2011-01-26 03:43:28 +01:00
Martin Storsjo
d89a08d81b rtsp: Make make_setup_request a nonstatic function 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit fef5649a82)
 2011-01-26 03:43:28 +01:00
Martin Storsjö
1a172ce6b1 applehttp: Fix the key check in handle_variant_args 
The key string is supposed to contain the equals character,
too.  Since the checked string was wrong, and the return value
check was wrong too, it incorrectly seemed to work right before.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 2b0decf60b)
 2011-01-26 03:43:28 +01:00
Kostya
69c78161d2 reindent after last commit 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit dacbcd170a)
 2011-01-26 03:43:28 +01:00
Kostya
8a485dd399 Extend WavPack demuxer and decoder to support >2 channel audio 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 3bdc886c22)
 2011-01-26 03:43:28 +01:00
Georgi Chorbadzhiyski
535638b55f mpegtsenc: set reserved bits to 1 in PCR field 
The reserved bits between PCR base and extension fields must be
set to 1.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 00:02:42 +00:00
Diego Elio Pettenò
57c4d01ec9 Make ff_rtsp_send_cmd_with_content_async static to rtsp.c. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 22:10:36 +01:00
Diego Elio Pettenò
a3dffc0627 Make ff_mxf_pixel_layouts static to mxf.c. 
Also make it an anonymous structure as never it is accessed by name.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 21:48:03 +01:00
Diego Elio Pettenò
101e1f6ff9 Make ff_interleave_compare_dts static to utils.c. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 21:48:03 +01:00
Anton Khirnov
c34461b35b mov: simplify mov_read_chapters() by using avio_get_str16be 
It probably also fixes a memleak or two.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 21:48:03 +01:00
Anton Khirnov
2934cd9dbf asfdec: remove some commented-out cruft 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 21:48:03 +01:00
Anton Khirnov
93b78d1210 lavf: make a variant of ff_get_str16_nolen public 
It will be useful in mp3 demuxer and hopeful some other places.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 21:48:03 +01:00
Jai Menon
c0ae5152d1 ffmetaenc: Use correct format specifiers. 
Use printf format macros from inttypes.h.
Additionally, this fixes a warning when building with clang.
 2011-01-25 17:34:11 +00:00
Mans Rullgard
1e48cdaac3 tty: remove superflous #include <strings.h> 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 15:57:53 +00:00
Georgi Chorbadzhiyski
6e78c8ee94 mpegtsenc: remove unused variables 
Remove two variables that were not used and caused the following
warnings:

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

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 12:52:45 +00:00
Jai Menon
9de202a633 ffmetaenc : Use more correct format specifiers. 
Additionally, this fixes a warning when building with clang.
 2011-01-24 22:55:43 -06:00
Mans Rullgard
6081f8c4e2 avidec: make print_tag() a macro and remove related ifdefs 
The dprintf macro is a no-op if DEBUG is not defined, so there
is no need to guard it here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 02:43:28 +00:00
Diego Elio Pettenò
119cc033fc Make RTPFirstDynamicPayloadHandler static to rtpdec.c 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 01:45:34 +00:00
Diego Elio Pettenò
69ad22c7a7 Make ff_realmedia_mp3_dynamic_handler static. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 01:37:32 +00:00
Diego Elio 'Flameeyes' Pettenò
73a0b19ba3 Don't check for DEBUG before using dprintf. 
The dprintf macro is no-op when DEBUG is unset, so there is no need to
put it conditional to DEBUG.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 00:25:50 +00:00
Diego Elio Pettenò
f0a8676958 Make dvenc.c functions static to the unit. 
Also drop some CONFIG_DV_MUXER #ifdefs probably vestigial from before the
split of dvenc and dvdec.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 00:02:12 +00:00
Baptiste Coudurier
d4e0130e46 In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it. 
In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet.
 2011-01-24 14:20:48 -08:00
Martin Storsjö
2762a7a28b rtspdec: Retry with TCP if UDP failed 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-24 22:49:36 +01:00
Martin Storsjo
e836b1b085 rtspdec: Move rtsp_read_pause up, next to rtsp_read_play 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-24 22:46:45 +01:00
Martin Storsjo
aeb2de1c82 rtsp: Use ff_rtsp_undo_setup in the cleanup code in ff_rtsp_make_request 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-24 22:46:43 +01:00
Martin Storsjo
93e7490ee0 rtsp: Split out a function undoing the setup made by ff_rtsp_make_setup_request 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-24 22:46:39 +01:00
Martin Storsjo
fef5649a82 rtsp: Make make_setup_request a nonstatic function 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-24 22:46:36 +01:00
Martin Storsjö
2b0decf60b applehttp: Fix the key check in handle_variant_args 
The key string is supposed to contain the equals character,
too.  Since the checked string was wrong, and the return value
check was wrong too, it incorrectly seemed to work right before.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-24 20:19:37 +00:00
Kostya
dacbcd170a reindent after last commit 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-24 20:46:58 +01:00
Kostya
3bdc886c22 Extend WavPack demuxer and decoder to support >2 channel audio 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-24 20:46:58 +01:00
Anton Khirnov
5b7e7544e1 mp3enc: support for id3v2.3 tags using a per-muxer AVOption 
fixes issue2562.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 22272f61bb)
 2011-01-23 19:32:07 +01:00
Anton Khirnov
fe01dd8d74 id3v2: split tables for various ID3v2 versions 
This is needed for upcoming ID3v2.3 muxing support.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit cb6bc57681)
 2011-01-23 19:32:07 +01:00
Anton Khirnov
5052830fec mp3enc: handle errors in id3v2_put_ttag 
make the initialization of put clearer

this are the differences between
[FFmpeg-devel] [PATCH 1/3] mp3enc: add support for writing UTF-16 tags
and the already applied 187e23478b

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 8c3caf7fb1)
 2011-01-23 19:32:07 +01:00
Clément Bœsch
204a18151c Move ID3v1 skip from decoder to demuxer 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 045b80e52d)
 2011-01-23 19:32:07 +01:00
Anton Khirnov
b6125545da mp3enc: add support for writing UTF-16 tags 
Also it gets rid of some mysterious magic numbers in code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 187e23478b)
 2011-01-23 19:32:07 +01:00
Anton Khirnov
6e89b61293 lavf: move ff_put_str16_nolen from asf to avio and rename it 
It will be useful in the mp3 muxer.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit dccbd97d72)
 2011-01-23 19:32:06 +01:00
Anton Khirnov
e910a77b0d avio: add av_put_str and deprecate put_strz in favor of it 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4efd5cf34b)
 2011-01-23 19:32:06 +01:00
Anton Khirnov
d3058be6ee lavf: move the version macros to a new header 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 50196a982b)
 2011-01-23 19:32:06 +01:00
Anton Khirnov
22272f61bb mp3enc: support for id3v2.3 tags using a per-muxer AVOption 
fixes issue2562.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-22 02:06:14 +01:00
Anton Khirnov
cb6bc57681 id3v2: split tables for various ID3v2 versions 
This is needed for upcoming ID3v2.3 muxing support.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-22 02:06:10 +01:00
Anton Khirnov
8c3caf7fb1 mp3enc: handle errors in id3v2_put_ttag 
make the initialization of put clearer

this are the differences between
[FFmpeg-devel] [PATCH 1/3] mp3enc: add support for writing UTF-16 tags
and the already applied 187e23478b

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-22 02:04:13 +01:00
Clément Bœsch
045b80e52d Move ID3v1 skip from decoder to demuxer 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-22 01:31:57 +01:00
Anton Khirnov
187e23478b mp3enc: add support for writing UTF-16 tags 
Also it gets rid of some mysterious magic numbers in code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 21:52:41 +00:00
Anton Khirnov
dccbd97d72 lavf: move ff_put_str16_nolen from asf to avio and rename it 
It will be useful in the mp3 muxer.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 20:21:51 +00:00
Anton Khirnov
4efd5cf34b avio: add av_put_str and deprecate put_strz in favor of it 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 20:21:03 +00:00
Anton Khirnov
eeb0b893e3 id3v2: use an enum for encodings instead of magic numbers. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d66eff3685)
 2011-01-21 20:36:01 +01:00
Anton Khirnov
baa69f8a84 Split mp3 demuxer and muxer into separate files. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d08928bbea)
 2011-01-21 20:36:01 +01:00
Janne Grunau
236bb68d76 mpegtsenc: prefer metadata keyed with "service_name" 
title metadata is only used as fallback if no service_name is available.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit e5fe65512b)
 2011-01-21 20:36:00 +01:00
Georgi Chorbadzhiyski
d7b219ca96 Set service_provider and service_name in mpegts demuxer 
Set service_provider and service_name in mpegts demuxer, previously
name and provider_name were set but since the muxer uses service_provider
and service_name use them.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e8315e7881)
 2011-01-21 20:36:00 +01:00
Anton Khirnov
d4cc1f5b97 id3v2: don't overwrite existing tags 
Apparently some broken taggers prepend a new ID3v2 tag leaving the
existing one intact. Our parser currently reads all tags and overwrites
existing values with supposedly outdated ones.

fixes issue2419

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 75aded8328)
 2011-01-21 20:36:00 +01:00
Anton Khirnov
189665d927 id3v2: convert metadata after all the tags were read 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f7fcd6a254)
 2011-01-21 20:36:00 +01:00
Anton Khirnov
b3158f7a42 id3v2: make ff_id3v2_parse static 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 46a2da7698)
 2011-01-21 20:36:00 +01:00
Georgi Chorbadzhiyski
7916202b97 Add service_provider and service_name metadata 
This patch adds support in mpegts muxer for using service_provider and
service_name metadata to set service_provider_name and service_name
fields in SDT.

Example usage:
   ffmpeg -i file.ts -f mpegts -re -acodec copy -vcodec copy -f mpegts \
       -metadata service_provider="Some provider" \
       -metadata service_name="Some Channel" \
       "udp://239.0.70.2:5000?pkt_size=1316&ttl=1"

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 69688e71bc)
 2011-01-21 20:35:46 +01:00
Anton Khirnov
50196a982b lavf: move the version macros to a new header 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 19:30:51 +00:00
Anton Khirnov
d66eff3685 id3v2: use an enum for encodings instead of magic numbers. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 18:42:10 +00:00
Anton Khirnov
d08928bbea Split mp3 demuxer and muxer into separate files. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 15:11:52 +00:00
Janne Grunau
e5fe65512b mpegtsenc: prefer metadata keyed with "service_name" 
title metadata is only used as fallback if no service_name is available.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-20 15:28:32 +01:00
Georgi Chorbadzhiyski
e8315e7881 Set service_provider and service_name in mpegts demuxer 
Set service_provider and service_name in mpegts demuxer, previously
name and provider_name were set but since the muxer uses service_provider
and service_name use them.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-20 13:42:27 +00:00
Anton Khirnov
75aded8328 id3v2: don't overwrite existing tags 
Apparently some broken taggers prepend a new ID3v2 tag leaving the
existing one intact. Our parser currently reads all tags and overwrites
existing values with supposedly outdated ones.

fixes issue2419

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-20 13:39:19 +00:00
Anton Khirnov
f7fcd6a254 id3v2: convert metadata after all the tags were read 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-20 13:36:28 +00:00
Anton Khirnov
46a2da7698 id3v2: make ff_id3v2_parse static 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-20 13:36:22 +00:00
Georgi Chorbadzhiyski
69688e71bc Add service_provider and service_name metadata 
This patch adds support in mpegts muxer for using service_provider and
service_name metadata to set service_provider_name and service_name
fields in SDT.

Example usage:
   ffmpeg -i file.ts -f mpegts -re -acodec copy -vcodec copy -f mpegts \
       -metadata service_provider="Some provider" \
       -metadata service_name="Some Channel" \
       "udp://239.0.70.2:5000?pkt_size=1316&ttl=1"

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-20 11:31:20 +00:00
Janne Grunau
2c3589bfda consolidate .gitignore patters into a single file 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-18 21:32:05 +01:00
Justin Ruggles
f61cbc22d3 Revise check for codec id in voc demuxer. 
This fixes demuxing of packets that do not contain a codec tag and come before the codec_id has been set.
 2011-01-18 13:07:17 -05:00
Justin Ruggles
1ae02fe03b Fix bug in voc demuxer that was introduced in SVN r26309. 
Fixes issue 2560.
 2011-01-18 12:15:36 -05:00
Reimar Döffinger
54bc640362 Missing parts of IVF muxer support. 2011-01-18 08:00:23 +01:00
Reimar Döffinger
326851b9bc Add muxer for IVF format. 2011-01-17 21:11:51 +01:00
John Wimer
b79c3df088 prevent integer overflow in calculating duration 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-01-17 17:05:58 +02:00
Janne Grunau
348b8218f7 convert svn:ignore properties to .gitignore files 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-17 15:50:14 +01:00
Michael Niedermayer
8bb7d97be0 Check 4xm headers for validity. This should avoid 1/0. 
Originally committed as revision 26392 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-16 18:22:29 +00:00
Michael Niedermayer
f9329946d0 Parse fact chunks from wav files to find duration. 
Originally committed as revision 26370 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-15 17:13:32 +00:00
Michael Niedermayer
724b1f6a05 Factor tag reading code out of wav read_header() 
Originally committed as revision 26369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-15 17:13:30 +00:00
Michael Niedermayer
462b26202b Set duration for wav files from sample size and data size or the wf64 sample value. 
This should improve duration accuracy slightly and avoids a warning about its
inaccuracy when accurate values are available. Idea by Frank Barchard

Originally committed as revision 26366 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-15 16:26:42 +00:00
Baptiste Coudurier
6dc7dc08ed In mxf muxer, check the return value of gmtime, fix #2494 
Originally committed as revision 26343 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-14 22:36:23 +00:00
Ronald S. Bultje
06ed024d4f Copy metadata from ASF files contained in RTSP streams from ASF to RTSP layer, 
so that applications can read it also.

Originally committed as revision 26332 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-14 19:44:44 +00:00
Ronald S. Bultje
7f88a5bf9b Introduce av_metadata_copy() to copy metadata from one struct to another. 
Originally committed as revision 26330 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-14 19:30:55 +00:00
Peter Ross
b070bcfe8a wtv: ignore VIDEOINFOHEADER2 picture aspect ratio information, as it is unreliable 
Originally committed as revision 26327 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-14 08:28:27 +00:00
Martin Storsjö
c66f53cf8b Revert aviobuf: Retry if the read/write function returns AVERROR(EAGAIN) 
This reverts SVN commit 26318, which broke MS-RTSP playback.

Originally committed as revision 26326 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-13 06:22:43 +00:00
Stefano Sabatini
0d3ee13551 Use AVERROR_INVALIDDATA rather than -1 for nutdec error codes. 
Originally committed as revision 26321 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-12 16:40:28 +00:00
Martin Storsjö
a6963f8304 aviobuf: Retry if the read/write function returns AVERROR(EAGAIN) 
Originally committed as revision 26318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-12 07:06:27 +00:00
Baptiste Coudurier
c3024f9e7e In mov demuxer, handle better wrong time scale, fix issue #2528 
Originally committed as revision 26311 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-11 21:06:37 +00:00
Baptiste Coudurier
f6253caf8b In mov demuxer, set r_frame_rate for cfr files 
Originally committed as revision 26310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-11 19:58:00 +00:00
Daniel Kang
e048a9cab1 Do not crash for illegal sample size, fixes issue 2502. 
Patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26309 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-11 14:08:45 +00:00
Stefano Sabatini
440d761e40 Clarify timestamps related error messages in compute_pkt_fields2(). 
Originally committed as revision 26308 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-11 12:17:27 +00:00
Peter Ross
1c4ac03530 electronicarts: prevent endless loop opportunity in process_audio_header_elements() 
Fixes issue2529.

Originally committed as revision 26307 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-11 02:25:12 +00:00
Peter Ross
74093bb593 revert r26302 
Originally committed as revision 26305 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-10 22:25:45 +00:00
Peter Ross
e19e051e56 electronicarts: prevent endless loop opportunity in process_audio_header_elements() 
Fixes issue2529.

Originally committed as revision 26302 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-10 12:56:50 +00:00
Peter Ross
42396c2e67 electronicarts: only apply audio sanity checks when audio stream is present 
Originally committed as revision 26301 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-10 12:51:45 +00:00
Daniel Kang
cb77dad724 perform sanity check on sample rate in electronicarts demuxer 
Fixes issue2525
Original patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26298 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-10 11:38:38 +00:00
Daniel Kang
4da766ce65 perform sanity check on number of channels in electronicarts demuxer 
Fixes issue2514
Original patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26296 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-10 11:02:07 +00:00
Martin Storsjö
a3b058b7ba rtsp: Properly fail if unable to open an input RTP port 
Originally committed as revision 26285 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 10:47:53 +00:00
Peter Ross
5a477e5960 fix indentation 
Originally committed as revision 26278 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 02:44:54 +00:00
Peter Ross
866009ea19 wtv: only process timestamp_guid chunks for streams that we know about 
Originally committed as revision 26277 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 02:42:16 +00:00
Peter Ross
a5a36a7970 wtv: do not repopulate codec information after we have seen data chunks 
Originally committed as revision 26276 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 02:35:06 +00:00
Peter Ross
bf2e54174e wtv: stop processing chunks if length is smaller than chunk header 
Originally committed as revision 26275 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 02:21:30 +00:00
Peter Ross
9372f31e03 wtv: fix typo 
Originally committed as revision 26274 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 02:13:58 +00:00
Peter Ross
50d83b2005 Add audio codec 0x1602 (AAC LATM) 
Originally committed as revision 26273 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 02:11:41 +00:00
Carl Eugen Hoyos
d267b339e4 Lagarith decoder by Nathan Caldwell, saintdev at gmail 
Originally committed as revision 26270 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-08 21:22:15 +00:00
Baptiste Coudurier
a2b7ed3274 In mov muxer, override codec tag for dv in mov, fix remuxing from avi 
Originally committed as revision 26257 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-07 19:56:31 +00:00
Baptiste Coudurier
10d8eac98d In mov muxer, override codec tag for h263 in mov, fix remuxing from 3gp 
Originally committed as revision 26255 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-07 19:55:08 +00:00
Martin Storsjö
a92c30d76e rtsp: Allow requesting of filtering of source packets 
If filtered, only packets from the right source address and port
are received.

To test, play back e.g. some mpeg4 video RTSP stream (where the
video stream is the first stream in the presentation) over UDP.
While receiving this stream, send another stream to the same port:
ffmpeg -re -i <whatever> -vcodec mpeg4 -an -f rtp
rtp://127.0.0.1:5000?localport=1234
Normally, the RTSP playback reports lots of errors at this point.

If the RTSP stream has the ?filter_src option enabled, these
interferring packets are ignored.

Originally committed as revision 26246 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 15:22:58 +00:00
Martin Storsjö
21a569f302 udp: Allow specifying the connect option in udp_set_remote_url, too 
If the remote address is updated later with this function, the caller
shouldn't set the connect option until in this call.

Originally committed as revision 26245 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 15:16:50 +00:00
Martin Storsjö
babd19ce2e rtpproto: Allow specifying the connect option, passed through to udp 
By calling connect on the UDP socket, only packets from the chosen
peer address and port are received on the socket. This is one
solution to issue 1688.

Originally committed as revision 26244 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 15:16:09 +00:00
Carl Eugen Hoyos
504530bfba Set blkalign to 3840 (maximum bytes per frame) for AC-3 in avi. 
Fixes playback for corner-cases like 32kHz 320kb.

Originally committed as revision 26242 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 13:30:32 +00:00
Martin Storsjö
79d482b108 rtpdec: Don't set RTP timestamps if they already are set by the depacketizer 
For MS-RTSP, we don't always get RTCP packets (never?), so the earlier
timestamping code never wrote anything into pkt->pts. The rtpdec_asf
depacketizer just sets the dts of the packet, so if the generic RTP
timestamping is used, too, we get inconsistent timestamps.

Therefore, skip the generic RTP timestamp algorithm if the depacketizer
already has set something.

This fixes "Invalid timestamps" warnings, present since SVN rev 26187.

Originally committed as revision 26241 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 11:33:06 +00:00
Daniel Kang
6cbce63650 Fix assertion fail on audio files with invalid sample rates, 
fixes issue 2475.

Patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26240 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 03:30:19 +00:00
Stefano Sabatini
6bbdba08c2 Revert previous commit, as it was not meant to be pushed. 
Originally committed as revision 26239 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 01:11:57 +00:00
Stefano Sabatini
7820147e6f Issue more explicit error messages in compute_pkt_fields2(). 
Originally committed as revision 26238 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 01:01:21 +00:00
Stefano Sabatini
81bd411965 In av_close_input_stream(), flush the packet queue before to actually 
close the stream.

This way the flushed packets can still reference the still unclosed
format context.

In particular this fixes a spurious error issued when closing the
video4linux2 buffer in mmap_release_buffer(), which tries to access
the file descriptor of an already closed file.

Originally committed as revision 26237 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 01:01:14 +00:00
Martin Storsjö
29db7c3af4 rtsp: Parse RTP-Info headers 
Originally committed as revision 26236 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 21:23:42 +00:00
Martin Storsjö
4cb06874c7 Reindent 
Originally committed as revision 26235 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 21:23:12 +00:00
Martin Storsjö
91d96bd3c0 rtsp: Simplify code 
Originally committed as revision 26234 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 21:22:50 +00:00
Martin Storsjö
1726813f13 rtsp: Move resetting of rtpdec parameters to before sending the PLAY request 
Originally committed as revision 26233 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 21:22:15 +00:00
Baptiste Coudurier
ab04337464 In ogg muxer, correctly mux VFR streams, fix issue #2398 
Originally committed as revision 26229 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 19:32:45 +00:00
Baptiste Coudurier
5e2202d6f3 In mov demuxer, check that gmtime returns a valid value, fix crash, issue #2490 
Originally committed as revision 26228 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 19:21:04 +00:00
Baptiste Coudurier
4af7166fb4 In mov demuxer, check that stts data exists, fix crash, issue #2479 
Originally committed as revision 26227 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 19:14:44 +00:00
Anton Khirnov
14fa75eab4 lavf: rename meta.h->ffmeta.h for consistency. 
Originally committed as revision 26211 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-04 12:35:39 +00:00
Peter Ross
6780f48846 wtv: obtain codec information from stream2_guid chunks, if present 
Originally committed as revision 26208 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-04 11:38:29 +00:00
Peter Ross
17e33f662a wtv: display warning if scrambled stream is detected 
Originally committed as revision 26197 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 11:17:34 +00:00
Anssi Hannula
cf99e4aa00 Add AVOption support for muxers. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26195 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:52:34 +00:00
Anssi Hannula
febd72be65 Use new function put_nbyte() to speed up padding. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26194 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:46:50 +00:00
Anssi Hannula
17ee8f669f Add function put_nbyte() to speed up padding in SPDIF muxer. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26193 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:45:07 +00:00
Martin Storsjö
d2995eb910 rtsp: Store the Content-Base header value straight to the target 
This avoids having a large temporary buffer in the struct used for
storing the rtsp reply headers.

Originally committed as revision 26192 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:11:12 +00:00
Martin Storsjö
77223c5388 rtsp: Pass the method name to ff_rtsp_parse_line 
Originally committed as revision 26191 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:10:12 +00:00
Martin Storsjö
acc9ed1450 rtsp: Pass RTSPState to ff_rtsp_parse_line, instead of HTTPAuthState 
This allows ff_rtsp_parse_line to do more changes directly in RTSPState
when parsing the reply, instead of having to store large amounts of
temporary data in RTSPMessageHeader.

Originally committed as revision 26190 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:07:56 +00:00
Martin Storsjö
3df54c6bf2 rtsp: Add a method parameter to ff_rtsp_read_reply 
Originally committed as revision 26189 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:06:21 +00:00
Daniel Kang
7f8ffc4efd Fix a floating point exception for invalid framerate, fixes issue 2470. 
Patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26188 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 05:01:46 +00:00
Martin Storsjö
3a1cdcc798 rtpdec: Emit timestamps for packets before the first RTCP packet, too 
Emitted timestamps in each stream start from 0, for the first received
RTP packet. Once an RTCP packet is received, that one is used for
sync, emitting timestamps that fit seamlessly into the earlier ones.

Originally committed as revision 26187 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-01 22:27:16 +00:00
Peter Ross
773d892a31 move ff_get_bmp_header under CONFIG_DEMUXERS block 
Originally committed as revision 26182 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-01 03:24:10 +00:00
Carl Eugen Hoyos
f6bf6e511d Set blkalign to maximum framesize to allow playback on WMP (see issue 2455 and issue 2446). 
Originally committed as revision 26167 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-30 14:21:14 +00:00
Carl Eugen Hoyos
548b97a66a Cosmetics: Re-indent after last commit. 
Originally committed as revision 26161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 23:43:25 +00:00
Anssi Hannula
cc6c0c7b52 Do not add the preamble if the DTS stream is already padded, like DTS in 
wav. In that case, DTS can be transmitted through S/PDIF without
the IEC 61937 headers.

Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 23:42:27 +00:00
Anssi Hannula
d8e481bb86 s/IEC958/IEC 61937 - IEC958 is a lower level format. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26141 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 18:48:32 +00:00
Anssi Hannula
836132ec43 Fix wrong bitstream mode for AC-3. 
Noticed by CrystalP from XBMC.

Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26130 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 16:48:40 +00:00
Anssi Hannula
a4c8e0a82b Improve error return values. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26129 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 16:42:14 +00:00
Anssi Hannula
977903521e Always encapsulate DTS in big-endian format, at least some receivers 
require that.

Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26128 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 16:34:47 +00:00
Anssi Hannula
e5e932e8b0 Add Anssi and myself to the authors in doxygen. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 16:30:07 +00:00
Peter Ross
3900707866 wtv: parse MPEG2 descriptor events 
Originally committed as revision 26126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 13:41:10 +00:00
Peter Ross
cc9038e95c add ff_parse_mpeg2_descriptor; make MPEG2 descriptor parsing routines available to other modules. 
Originally committed as revision 26125 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 12:45:31 +00:00
Peter Ross
0af1671e53 wtv: only warn about unknown subtype, if it actually unknown 
Originally committed as revision 26123 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 10:43:16 +00:00
Peter Ross
945df9703b wtv: use correct names for subtitle and language guids 
Originally committed as revision 26122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 03:49:02 +00:00
Michael Niedermayer
7cf0472e6a Fix assertion failure due to frames being 0 in mp3 vbr bitrate calculation. 
Fixes issue 2442.

Originally committed as revision 26121 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 01:33:36 +00:00
Anton Khirnov
bb50ed089f ffmetaenc: remove useless initializers 
Originally committed as revision 26114 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-28 09:03:38 +00:00
Anton Khirnov
645439c3c3 lavf: rename meta{dec,enc}.c -> ffmeta{dec,enc}.c 
Originally committed as revision 26113 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-28 09:03:33 +00:00
Martin Storsjö
9e99f84f7d rtsp: Check if the rtp stream actually has an RTPDemuxContext 
For example MS-RTSP doesn't have RTPDemuxContexts for all streams.

This fixes issue 2448.

Originally committed as revision 26107 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-27 09:56:19 +00:00
Nicolas George
9128ae08b3 Implement av_find_best_stream. 
Originally committed as revision 26104 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-27 09:08:20 +00:00
Anton Khirnov
107a7e3e7b lavf: bump minor and add APIchanges entry after adding AVFMT_NOSTREAMS 
Originally committed as revision 26103 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-27 07:46:57 +00:00
Anton Khirnov
fd5b124d74 Metadata demuxer. 
Originally committed as revision 26102 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-27 07:46:53 +00:00
Anton Khirnov
a46515115c Metadata muxer 
Dumps all metadata to a text file for easy manual editing.

Originally committed as revision 26101 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-27 07:46:49 +00:00
Anton Khirnov
bb62d5c1f0 Allow output formats without any streams. 
Required for future metadata format.

Originally committed as revision 26100 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-27 07:46:44 +00:00
Peter Ross
a187c68678 Bump libavformat minor version, forgotten in r26094 
Originally committed as revision 26095 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 05:48:38 +00:00
Peter Ross
82ca054a63 Windows Televison (WTV) demuxer 
Originally committed as revision 26094 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 01:28:25 +00:00
Peter Ross
a750050f4c make guid utility function visibile to other modules (ff_guidcmp, ff_get_guid) 
Originally committed as revision 26093 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 01:26:29 +00:00
Peter Ross
141de5a9c1 add ff_find_stream_index 
Originally committed as revision 26092 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 01:24:51 +00:00
Peter Ross
456a70aeb8 add ff_get_bmp_header 
Originally committed as revision 26091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 01:23:44 +00:00
Michael Niedermayer
58ec7e00db Clarify AVFMT_TS_DISCONT and muxers. 
Originally committed as revision 26089 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-25 19:49:15 +00:00
Martin Storsjö
8c579c1c60 rtsp: Require the transport reply from the server to match the request 
This fixes a crash if we requested TCP interleaved transport, but the
server replies with transport data for UDP. According to the RFC, the
server isn't allowed to respond with another transport type than the
one requested.

Originally committed as revision 26077 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-23 15:05:24 +00:00
Martin Storsjö
81c8c18780 Makefile: Fix dependencies of components 
This fixes compilation with --disable-everything --enable-<component>,
for all encoders, decoders, muxers, demuxers, parsers, protocols, bsfs,
indevs, outdevs and filters at the moment. (All those that work without
any external dependencies at least.)

Originally committed as revision 26076 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-22 20:00:42 +00:00
Martin Storsjö
1e0957cc6b Add a missing dependency for the WebM muxer 
This fixes one of the issues found if building with
--disable-everything --enable-muxer=webm

Originally committed as revision 26066 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-21 09:23:35 +00:00
Martin Storsjö
9b14ec5fae sdp: Add a framesize attribute to H.263 SDP descriptions 
While not mentioned in RFC 4629, this is required for H.263 in
3GPP TS 26.234. It is in practice required for playback with
Android stagefright and on Samsung bada phones.

Originally committed as revision 26062 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-20 20:46:40 +00:00
David Czech
9100d4d632 Fix crash if invalid bit-rate was read from file. 
Fixes issue 2426.

Patch by David Czech, davidczech510 gmail

Originally committed as revision 26061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-20 09:58:27 +00:00
Reimar Döffinger
bf09a01981 Change ASF demuxer to return incomplete last packets. 
Whether the behaviour for streams using scrambling makes sense
is unclear.

Originally committed as revision 26053 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-18 13:18:52 +00:00
Zhentan Feng
c4e93eeecd Increase buffer size because the header itself can be larger than 8192 
(largest size according to spec: 64k). Fixes playback of
mmsh://a1635.v24937.c2493.g.vm.akamaistream.net/7/1635/2493/v0001/premrad.download.akamai.com/2493/premiere_rock_report/Country_Report.wma

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 26047 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-17 21:17:40 +00:00
Martin Storsjö
bbd8f5477d rtsp: Don't set the RTP time base from the sample rate if no sample rate is set 
This also reverts SVN rev 26016, which incorrectly overwrote the time base
with 90 kHz for all streams, regardless of what was set by the SDP parsing.

The stream that triggered the fix in 26016 still works after this commit.

Originally committed as revision 26022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-15 21:06:25 +00:00
Luca Barbato
a4a3bade0a Reinstate default time_base for rtp streams 
The generic default is 0/0 and that obviously triggers once the value is used.

Originally committed as revision 26016 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-15 17:16:37 +00:00
Thomas Guillem
1aa58c6405 tcp: Check url_interrupt_cb if connect was interrupted by a signal 
This makes it possible to abort a blocking connect call.

Patch by Thomas Guillem, thomas dot guillem at gmail

Originally committed as revision 26014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 23:03:05 +00:00
Justin Ruggles
80575c0e55 Add missing dependency for matroska muxer. 
Originally committed as revision 26005 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 17:14:40 +00:00
Reimar Döffinger
4172951ba7 Return an error when get_buffer reads none or only partial data instead 
of returning packets with uninitialized data.
Returning partial packets as for other demuxers is problematice due to
packet scrambling and thus is not done.

Originally committed as revision 25931 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-11 21:41:47 +00:00
Reimar Döffinger
3c3ef81b9b Ensure that packets returned from ASF demuxer are properly 0-padded. 
Originally committed as revision 25930 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-11 21:39:08 +00:00
Reimar Döffinger
b72daad062 Remove hack in MP3 probe that was meant as a work-around for large 
ID3v2 tags which no longer works since ID3v2 handling was moved to
generic code.
In addition, in caused false-positives for all files starting with
one or more 0-bytes.

Originally committed as revision 25929 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-11 21:34:50 +00:00
Anton Khirnov
a152c77f26 id3v2: skip data length indicator 
Originally committed as revision 25926 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-10 15:48:56 +00:00
Kostya Shishkov
614e139a11 Don't try to demux WavPack files with >2 channels until we can support them 
Originally committed as revision 25919 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-07 18:15:06 +00:00
Martin Storsjö
86b6e387cc rtsp/rtpdec: Set the AVStream time_base directly in rtsp when it is known 
This fixes cases where the RTP time base and the sample rate of the stream
differ. Previously, the AVStream time_base was unconditionally set to
the sample rate (which initially was set to one value when parsing the
rtpmap field in the SDP, but later overridden by an a=SampleRate field).

Additionally, this makes the code actually use the stream time base set
in rtpmap for video codecs, instead of hardcoding it to always be 90 kHz.

Originally committed as revision 25908 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-07 13:29:44 +00:00
Martin Storsjö
bb776f3b00 rtsp: Parse RealRTSP sample rate declarations from the SDP 
The RTP time base can be different from the actual content sample rate.

Originally committed as revision 25907 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-07 13:28:45 +00:00
Martin Storsjö
2eeefe205f rtpdec: Handle MP3 in RealRTSP 
This fixes playback of a RealRTSP/MP3 URL from the RTSP samples on
MultimediaWiki.

Originally committed as revision 25906 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-07 13:28:13 +00:00
Anton Khirnov
407d3d5a3a id3v2: skip encrypted/compressed frames 
Originally committed as revision 25903 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-07 07:52:54 +00:00
Anton Khirnov
7a07d158bd id3v2: use a named constant instead of 0x02 
Originally committed as revision 25902 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-07 07:52:50 +00:00
Baptiste Coudurier
c6f1e29a15 In mov demuxer, read alac sample from extradata, fix #2406 
Originally committed as revision 25901 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-07 01:38:26 +00:00
Martin Storsjö
86042de8a5 rtpdec_h264: Pass NAL type 0 through 
According to the spec, this type shouldn't ever be used. Nevertheless,
passing it through enables decoding streams which otherwise aren't
decodeable.

Originally committed as revision 25897 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-06 12:44:09 +00:00
Martin Storsjö
4838cdab21 rtpdec: Skip padding bytes at the end of packets 
Originally committed as revision 25896 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-06 12:43:38 +00:00
Martin Storsjö
28b4eb95bc rtpdec_qcelp: Use the depacketizer for static payload types, too 
Originally committed as revision 25894 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-05 19:42:14 +00:00
Martin Storsjö
6a7e31a901 rtsp: Look for RTP payload handlers for static payload types, too 
Originally committed as revision 25893 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-05 19:41:44 +00:00
Martin Storsjö
003eb64217 rtsp: Factorize code for initializing the rtp payload handler 
Originally committed as revision 25892 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-05 19:41:09 +00:00
Martin Storsjö
1e515c4280 rtpdec: Add functions for finding depacketizers by name or payload id 
Originally committed as revision 25891 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-05 19:39:50 +00:00
Martin Storsjö
2beb910d79 rtpdec: Allow dynamic payload handlers to handle static payload types, too 
Originally committed as revision 25890 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-05 19:38:55 +00:00
Martin Storsjö
35014efcc6 rtpdec: Add a dynamic payload handler for the x-Purevoice format, RFC 2658 
This fixes roundup issue 2390.

Originally committed as revision 25889 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-05 19:37:45 +00:00
Martin Storsjö
35b0169484 RTP/VP8: Update the warning about the VP8 payload 
The current implementation is incompatible with the latest spec drafts,
this should be communicated clearly to the user.

Originally committed as revision 25887 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-05 11:45:57 +00:00
Aurelien Jacobs
118ccae030 add subtitle codec autodetection 
Originally committed as revision 25884 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-04 14:46:13 +00:00
Aurelien Jacobs
5bdbf64cf3 set default subtitle_codec for ass muxer 
Originally committed as revision 25870 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-04 00:47:12 +00:00
Aurelien Jacobs
908dc2a0b8 cosmetic: alignment 
Originally committed as revision 25869 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-04 00:44:42 +00:00
Aurelien Jacobs
87d69d3232 use designated initializer in ASS (de)muxer 
Originally committed as revision 25868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-04 00:37:53 +00:00
Tomas Härdin
66be80d610 mpegtsenc: Improve PCR generation and output 
This fixes PCR drift due to accumulating TS_PACKET_SIZE*8*90000LL/ts->mux_rate each packet, due to rounding errors when mux_rate does not evenly divide 135360000.
This patch also increases the PCR precision to 27 MHz from 90 kHz and takes the location of the PCR data into account (+11 bytes according to the spec).

Originally committed as revision 25864 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-03 13:26:42 +00:00
Stefan Gehrer
77b7c334be skip top-level objects to search for the simple index in ASF files 
Originally committed as revision 25863 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-03 07:49:07 +00:00
Anton Khirnov
3694ac240b mpc: read id3v1 tags. 
Originally committed as revision 25860 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-02 09:56:15 +00:00
Andrew Wason
3d305fd071 Add FourCC yuvs for rawvideo (PIX_FMT_YUYV422). 
Patch by Andrew Wason, rectalogic rectalogic com

Originally committed as revision 25853 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-29 23:15:51 +00:00
Aaron Colwell
365d8e471d Ensure that data_offset is set correctly when there are partial 
data packets before the first complete one.
Patch by Aaron Colwell [acolwell chromium org].

Originally committed as revision 25846 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-29 19:02:28 +00:00
Anton Khirnov
82f19afefe Partially revert "Simplify code by using av_metadata_set2()." 
This reverts snprintf->av_d2str part of r20840.
With it, track number is exported as a float, which is not
desirable.

Originally committed as revision 25845 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-29 16:38:12 +00:00
Martin Storsjö
4da71f18f6 rtpdec: Remove useless NULL initializations when using designated initializers 
Originally committed as revision 25844 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-29 16:04:45 +00:00
Martin Storsjö
fe70a95e1d rtpdec: Change the qdm2, qt and svq3 depacketizers to use designated initializers 
Originally committed as revision 25843 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-29 16:04:04 +00:00
Baptiste Coudurier
74f726209f In ts demuxer, if pes packet size is < ts packet, honor pes packet and skip padded data. 
Fixes issue #2392.

Originally committed as revision 25841 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-29 03:43:56 +00:00
Martin Storsjö
0b6a7ff4b4 rtsp: Do a forgotten reindenting 
Originally committed as revision 25839 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-28 21:17:39 +00:00
Peter Ross
e8ffb2fa4c Add G.722 to RIFF codec list 
Originally committed as revision 25837 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-28 03:01:00 +00:00
Carl Eugen Hoyos
2400730fe7 Increase avformat micro version, forgotten in r25834. 
Originally committed as revision 25836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-27 20:29:54 +00:00
Carl Eugen Hoyos
25a08596d3 Add copyright notices for the E-AC3 and TrueHD parts of the muxer. 
Originally committed as revision 25835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-27 18:10:20 +00:00
Anssi Hannula
323e3f8b6c IEC 61937 encapsulation of TrueHD for HDMI passthrough. 
This works at least for some people testing it.

Patch by Anssi Hannula, anssi d hannula a iki fi

Originally committed as revision 25834 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-27 18:08:01 +00:00
Reimar Döffinger
fe9d2edbdb DV: use data_offset to fix seeking in badly cut files where the first 
complete frame does not start at position 0.

Originally committed as revision 25833 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-27 14:40:12 +00:00
Anatoly Nenashev
9d09ebf1ed Mobotix .mxg demuxer 
Patch by Anatoly Nenashev, anatoly d nenashev a ovsoft d ru

Originally committed as revision 25831 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-26 10:11:16 +00:00
Baptiste Coudurier
adc7305424 In mov demuxer, if multiple h264 stsd are present, do not concatenate streams, fix #2069 
Originally committed as revision 25825 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-25 05:03:29 +00:00
Baptiste Coudurier
581ba2cee1 In av_find_stream_info, decode more h264 to get correct delay, issue #2020 
Originally committed as revision 25824 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-25 02:19:03 +00:00
Stephen D'Angelo
c538eb51c6 In TS demuxer, create the AVStream during pmt parsing if the pes stream does not 
yet have it, this can happen if the pes stream contain data but no pes header
has been encoutered yet.
Patch by Stephen D'Angelo, SDAngelo at evertz dot com.

Originally committed as revision 25823 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-25 00:55:02 +00:00
Baptiste Coudurier
b795ff97e5 In TS demuxer, keep the pmt filter open to parse all pmt sections, 
based on patch by Stephen D'Angelo, SDAngelo at evertz dot com.

Originally committed as revision 25822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-25 00:29:44 +00:00
Aurelien Jacobs
8ba5bf5a7c avidec: read some of the Nikon specific tags produced by Nikon cameras 
Originally committed as revision 25821 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-24 20:53:27 +00:00
Aurelien Jacobs
73d0e33102 avidec: support non-standard creation_time format 
Originally committed as revision 25815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 12:04:50 +00:00
Aurelien Jacobs
d35cdd5719 avidec: trivial simplification regarding av_metadata_set 
Originally committed as revision 25814 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 12:03:23 +00:00
Anton Khirnov
eaa4542b64 matroskaenc: don't duplicate title information 
Title is already written into special fields designated for it --
per-segment Title, per-chapter ChapString and per-stream Name (yay for
consistent naming). Therefore, don't duplicate it in Tags.

Originally committed as revision 25813 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 08:24:41 +00:00
Anton Khirnov
bcb5d217ba id3v2: add TDEN<->creation_time tag mapping 
Originally committed as revision 25812 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 07:54:47 +00:00
Anton Khirnov
29c5c59013 lavf: document the new creation_time tag 
Originally committed as revision 25811 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 07:54:44 +00:00
Baptiste Coudurier
8ee764b020 Remove some warnings 
Originally committed as revision 25808 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 01:10:21 +00:00
Baptiste Coudurier
175272cb07 10l, fix memleak, forgot to free mp4_dec_config_descr 
Originally committed as revision 25807 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 01:04:49 +00:00
Baptiste Coudurier
798c6facb7 In ts demuxer, support aac flexmux using extradata in iods, issue #2346 
Originally committed as revision 25806 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 00:51:12 +00:00
Baptiste Coudurier
91360ce61d Unset variable fps for mov and mp4 muxer, they support it 
but timestamps must start at 0 currently, and this causes sync
problem.

Originally committed as revision 25805 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-23 00:41:28 +00:00
Anssi Hannula
3b39e2739f S/PDIF demuxer 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 25804 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-22 22:09:26 +00:00
Aurelien Jacobs
7df2214328 movdec: export creation_date as metadata 
Originally committed as revision 25786 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 19:02:52 +00:00
Aurelien Jacobs
933875a0f5 avidec: export creation_date as metadata 
Originally committed as revision 25785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 19:00:07 +00:00
Reimar Döffinger
fa8cc12650 Improve documentation wording. 
Originally committed as revision 25782 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 11:33:26 +00:00
Reimar Döffinger
0f46d68522 Fix indentation. 
Originally committed as revision 25781 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 11:07:04 +00:00
Reimar Döffinger
24ae353dfb WC3/xan: move palette handling to decoder, avoiding need for 
PaletteControl.
This also fixes playback of some files with ffplay (images were
corrupted for a short time after a palette change).

Originally committed as revision 25778 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 10:32:23 +00:00
Reimar Döffinger
6bfc268305 Add av_append_packet function, to be used in code that merges packets 
to allow palette handling without using PaletteControl.

Originally committed as revision 25777 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 10:24:48 +00:00
Reimar Döffinger
d9640a55ea Merge rotation into lookup table. 
Originally committed as revision 25774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-20 09:36:46 +00:00
Carl Eugen Hoyos
4b6bfbe2b7 100l: Fix crash in SPDIF muxer. 
Originally committed as revision 25762 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-17 23:23:25 +00:00
Carl Eugen Hoyos
909865fdbe Add support for IEC 61937 ("SPDIF") encapsulation for E-AC-3. 
Only works via HDMI.

Patch by Anssi Hannula (anssi d hannula a iki d fi), based on some work
by myself.

Originally committed as revision 25760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-17 12:22:59 +00:00
Aurelien Jacobs
b3c0fc7673 av_find_stream_info(): set subtitle codec time_base 
Originally committed as revision 25758 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-16 23:50:18 +00:00
Baptiste Coudurier
2b91d83ef3 In mov demuxer, export .mov encoder metadata tag 
Originally committed as revision 25757 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-16 05:55:09 +00:00
Martin Storsjö
dd22cfb101 rtsp: Parse and use the Content-Base reply header, if present 
This fixes playing RTSP urls with query parameters.

Originally committed as revision 25755 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-15 15:08:53 +00:00
Aurelien Jacobs
cb2c971d91 allow passing subtitles header between decoder and encoder 
Originally committed as revision 25745 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-13 13:57:49 +00:00
Anton Khirnov
273231466c lavf/utils: use av_{i/o}format_next() instead of first_{i/o}format 
Originally committed as revision 25738 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-13 08:55:15 +00:00
Stefano Sabatini
5d6e4c160a Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum 
SampleFormat with AVSampleFormat.

Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-12 11:04:40 +00:00
Anssi Hannula
8079d2ec08 Move code to be used by the IEC 61937 demuxer from spifenc.c into common 
files spdif.h and spdif.c.

Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 25715 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-10 00:04:12 +00:00
Anssi Hannula
8cceef1681 Rename spdif.c as spdifenc,c to prepare for future spdif demuxer. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 25713 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-09 23:57:02 +00:00
Yuriy Kaminskiy
c77549c510 rtsp: Set the real_setup pointer properly, avoid out of bounds memory accesses 
This fixes a regression since svn rev 24752, where the real_setup pointer
was set incorrectly. The arithmetic with the real_setup_cache pointer
is in units of enum AVDiscard, so the sizeof multiplication should be removed.

Patch by Yuriy Kaminskiy, yumkam at mail dot ru.

Originally committed as revision 25684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-06 23:26:49 +00:00
Ronald S. Bultje
37e9cc4ec7 Remove two instances of AVERROR(ff_neterrno()), because ff_neterrno() itself 
already does AVERROR().

Originally committed as revision 25671 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-04 13:53:16 +00:00
Stefano Sabatini
ba7d6e798e Remove usage of deprecated libavcodec/audioconvert.h functions. 
Originally committed as revision 25668 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-03 20:19:34 +00:00
Thierry Foucu
caa7ad5dc6 Fix 16kHz Mono NellyMoser in flv. 
Patch by Thierry Foucu, tfoucu gmail

Originally committed as revision 25667 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-03 20:12:07 +00:00
Anton Khirnov
bf800c7db8 matroskadec: skip invalid tags with no TagName 
fixes segfault in issue 2328

Originally committed as revision 25659 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-03 06:29:04 +00:00
Mike Edenfield
7e35d8596b http: Handle 301/307 redirect requests, too 
Patch by Mike Edenfield, kutulu at kutulu dot org

Originally committed as revision 25651 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-02 20:37:01 +00:00
Janne Grunau
915bfa33d1 mpegts: support LATM syntax 
Originally committed as revision 25643 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-02 08:32:33 +00:00
Stefano Sabatini
267ff3aed1 Document url_write(). 
Originally committed as revision 25613 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-31 16:11:56 +00:00
Martin Storsjö
0526c6f7c7 rtsp: Split out the RTSP demuxer functions to a separate, new file 
Originally committed as revision 25601 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-29 08:43:57 +00:00
Martin Storsjö
c2688f3ac8 rtsp: Move rtsp_setup_output_streams into rtspenc.c 
Originally committed as revision 25600 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-29 08:41:49 +00:00
Anton Khirnov
042ca05f0f vorbiscomment: convert metadata before computing the header's length 
Originally committed as revision 25586 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-27 05:02:29 +00:00
Martin Storsjö
47bfe49c64 rtsp: Add stub declarations of the setup_in/output_streams functions 
This may be needed to avoid calls to implicitly defined functions
(that will be removed by dead code elimination later anyway).

Originally committed as revision 25585 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-27 00:42:35 +00:00
Anton Khirnov
c55f891c2f nutdec: when parsing info packet, set metadata var only once 
Originally committed as revision 25558 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-24 07:28:04 +00:00
Aurelien Jacobs
a5cea13202 drop rtsp_default_protocols which is not part of public API and not used anymore 
Originally committed as revision 25557 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-23 16:22:36 +00:00
Aurelien Jacobs
a178edf298 drop rtp_get_file_handles() which is not part of public API and not used anymore 
Originally committed as revision 25556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-23 16:21:49 +00:00
Aurelien Jacobs
fb660f4015 drop rtp_get_local_port() which is not part of public API and not used anymore 
Originally committed as revision 25555 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-23 16:20:56 +00:00
Aurelien Jacobs
67f34aaa97 use rtp_get_local_rtp_port() instead of the deprecated rtp_get_local_port() 
Originally committed as revision 25554 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-23 16:19:53 +00:00
Pascal Massimino
85f56757b4 cosmetics: align fields, and remove useless ones, in img2.c 
Originally committed as revision 25539 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-21 22:07:00 +00:00
Martin Storsjö
eced8fa02e rtsp: Move the rtsp_probe function to the demuxer code block 
This function is only used by the RTSP demuxer.

Originally committed as revision 25537 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-21 12:25:12 +00:00
Martin Storsjö
a66d44f0d2 Restore alphabetical order 
Originally committed as revision 25536 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-21 12:19:14 +00:00
Martin Storsjö
44b70ce563 rtsp: Untangle the dependencies between the RTSP/SDP demuxers and RTSP muxer 
This allows compilation of one of them without requiring the others'
dependencies to be present.

Originally committed as revision 25535 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-21 12:18:48 +00:00
Martin Storsjö
8bf0f96954 rtsp: Reorder functions 
Originally committed as revision 25534 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-21 12:13:02 +00:00
Pascal Massimino
ac6d020ffa cleanup image2pipe_{de}muxer fields 
Originally committed as revision 25531 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-21 00:57:53 +00:00
Martin Storsjö
095e5c0b6d sdp: Conditionally compile code using AF_INET6 
Should fix compilation in environments unaware of IPv6.

Originally committed as revision 25528 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-19 07:50:40 +00:00
Martin Storsjö
44594cc798 Add a demuxer for receiving raw rtp:// URLs without an SDP description 
The demuxer inspects the payload type of a received RTP packet and
handles the cases where the content is fully described by the payload type.

Originally committed as revision 25527 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-19 07:38:53 +00:00
Aurelien Jacobs
a3a29c2651 metadata: make av_metadata_set2 case insensitive by default 
Originally committed as revision 25515 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-18 12:45:15 +00:00
Michael Niedermayer
94bdb1f80c Avoid negative SCR in mpeg ps muxer. 
Fixes a scr issue reported with dvdauthor ([FFmpeg-user] FFMPEG encoded MPEG-2 video causes error in DVDAuthor)

Originally committed as revision 25512 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 21:31:31 +00:00
Anton Khirnov
ad7768f4c4 add ff_ prefix to metadata_conv() 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25505 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 13:20:41 +00:00
Anton Khirnov
d60a9f52eb lavf: simplify setting the encoder ident tag. 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25504 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 13:07:20 +00:00
Martin Storsjö
fb66c31da4 Fix building, include the header instead of the source file 
Builds only seemed to have been broken in some configurations, though.

Originally committed as revision 25499 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 08:50:50 +00:00
Baptiste Coudurier
96d1e75a0c In mov muxer, write artist metadata tag 
Originally committed as revision 25498 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 23:23:47 +00:00
Baptiste Coudurier
edd33cb6fa In mov muxer, use correct metadata tag for encoder, and use the generic metadata api name 
Originally committed as revision 25497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 23:16:11 +00:00
Martin Storsjö
946df0598b rtpdec: Return AVERROR(EAGAIN) for mpegts parsing errors 
This indicates that there was no error that needs to be reported to the
caller, so we can move on to parse the next packet immediately, if
available. The only error code that ff_mpegts_parse_packet can return
indicates that there was no packet to return from the provided data, for
which it returns -1.

Originally committed as revision 25496 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 21:32:21 +00:00
Anton Khirnov
03700d399b Export metadata in the generic format. Deprecate old conversion API. 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 19:04:25 +00:00
Aurelien Jacobs
ed09233fa2 cosmetic: alignment 
Originally committed as revision 25492 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 18:30:43 +00:00
Aurelien Jacobs
13728334e8 add FF_API_SYMVER define to disable symver compatibility functions 
Originally committed as revision 25491 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 18:25:01 +00:00
Aurelien Jacobs
114c9a5925 add FF_API_FIRST_FORMAT define to drop deprecated first_?format from public api 
Originally committed as revision 25489 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 14:25:36 +00:00
Aurelien Jacobs
0139fdea08 add FF_API_PARAMETERS_CODEC_ID define to disable the deprecated codec_id 
fields in AVFormatParameters

Originally committed as revision 25488 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 14:19:01 +00:00
Aurelien Jacobs
d1742ff779 add FF_API_LAVF_UNUSED define to disable the unused struct fields 
Originally committed as revision 25487 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 14:12:25 +00:00
Aurelien Jacobs
634e0304a8 add FF_API_READ_SEEK define to drop usage of AVInputFormat.read_seek 
and delay this transition to v54 as it is currently not functional

Originally committed as revision 25486 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 13:39:15 +00:00
Aurelien Jacobs
d87a521cde add FF_API_PARSE_FRAME_PARAM define to disable the deprecated 
parse_image_size() and parse_frame_rate() public functions

Originally committed as revision 25485 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 13:33:23 +00:00
Aurelien Jacobs
ade800c5b7 properly check for FF_API_URL_CLASS instead of LIBAVFORMAT_VERSION_MAJOR 
Originally committed as revision 25484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 13:09:35 +00:00
Aurelien Jacobs
ca51d86c96 add FF_API_ALLOC_FORMAT_CONTEXT define to disable the deprecated 
av_alloc_format_context() public function

Originally committed as revision 25483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 12:59:45 +00:00
Aurelien Jacobs
88e44314ea add FF_API_URL_SPLIT define to disable the deprecated ff_url_split() function 
Originally committed as revision 25482 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 12:54:12 +00:00
Aurelien Jacobs
8ef30ac1f3 add FF_API_UDP_GET_FILE define to disable the deprecated udp_get_file_handle() 
public function

Originally committed as revision 25481 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 12:49:48 +00:00
Aurelien Jacobs
198ac67fe8 add FF_API_GUESS_FORMAT define to disable the deprecated guess_format() 
and guess_stream_format() public functions

Originally committed as revision 25480 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 12:45:14 +00:00
Anton Khirnov
a15c7fd6cb Deprecate old API. 
Patch by Anton Khirnov, anton khirnov net

Originally committed as revision 25479 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 09:41:20 +00:00
Anton Khirnov
81e5ff7ae2 vorbiscomment: change ff_vorbiscomment_write to take an AVMetadata** 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25473 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-14 19:08:31 +00:00
Martin Storsjö
54b2a4238c sapdec: Include sys/time.h for struct timeval 
This hopefully fixes compile errors on OS/2

Originally committed as revision 25466 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-13 11:09:06 +00:00
Martin Storsjö
01c8d258da Add a SAP demuxer 
Originally committed as revision 25463 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-13 09:06:59 +00:00
Martin Storsjö
65cdee9c95 rtpdec: Don't use the no reordering codepath if there already is a queue 
Originally committed as revision 25462 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-13 08:47:34 +00:00
Martin Storsjö
ddcf841191 rtpdec: Handle wrapping seq numbers in has_next_packet properly 
Originally committed as revision 25461 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-13 08:15:39 +00:00
Martin Storsjö
d678a6fd82 rtpdec: Parse the next packet in the sequence if it is available, if the previous packet didn't return any data 
Originally committed as revision 25460 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-13 08:14:30 +00:00
Martin Storsjö
91ec7aea20 rtpdec: Return AVERROR(EAGAIN) if out of data for mpegts, pass returned error codes through 
Originally committed as revision 25459 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-13 08:13:53 +00:00
Martin Storsjö
f6e138b4f4 rtpdec: Don't call the depacketizer to return more data unless it actually said it has more data 
It may have returned a negative number for an error (e.g. AVERROR(EAGAIN),
if more data is required for it to be able to return a complete packet).

Originally committed as revision 25458 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-13 08:13:07 +00:00
Martin Storsjö
4ffff36751 rtpdec: Split out storing of the depacketization return value to a separate function 
This makes the code less fragile and easier to understand.

Originally committed as revision 25457 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-13 08:12:23 +00:00
Martin Storsjö
ad64a807a9 Add forgotten minor bump and changelog entry for the SAP muxer 
Originally committed as revision 25444 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-11 11:50:33 +00:00
Alex Converse
d256d21e3f oggenc: Don't use char* to point to a string constant. 
Originally committed as revision 25440 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-10 21:15:21 +00:00
Peter Ross
1e6f8d53fc cafdec: Handle ALAC extradata. 
This fixes roundup issue 2284.

Originally committed as revision 25430 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-10 00:50:37 +00:00
Martin Storsjö
c689cccec9 libavformat: Always build id3v1.o and id3v2.o 
Functions from these files are referenced from utils.c now. This fixes
building with --disable-everything.

Originally committed as revision 25425 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-09 14:58:46 +00:00
Martin Storsjö
1b40d4966c sapenc: Use the normal URL port as RTP port 
This makes the URL handling consistent - the URL hostname is used as
destination for the RTP packets, so the URL port should also belong to that.
Now the options announce_addr= and announce_port specify where the
announcements are sent.

Originally committed as revision 25424 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-09 14:39:31 +00:00
Martin Storsjö
a1fc29f588 sapenc: Include os_support.h, to provide a fallback definition for socklen_t 
Originally committed as revision 25422 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-09 09:16:40 +00:00
Aurelien Jacobs
fd0368e7ca move av_find_stream_info() info struct to AVStream to avoid messy (re)allocation 
Originally committed as revision 25418 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 22:01:19 +00:00
Martin Storsjö
d1f676b8d4 Fix compilation on FreeBSD, use AF_UNSPEC instead of PF_UNSPEC 
Originally committed as revision 25416 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 18:07:40 +00:00
Martin Storsjö
fcc7f40449 sapenc: Mark the muxer as depending on network functions 
Hide all code mentioning IPv6 behind HAVE_STRUCT_SOCKADDR_IN6.

Originally committed as revision 25415 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 17:48:13 +00:00
Michael Niedermayer
d03b93e372 Add a space between the else and { in mpegenc.c in the line i added. 
Originally committed as revision 25414 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 15:41:41 +00:00
Martin Storsjö
011071e717 Add a SAP (Session Announcement Protocol, RFC 2974) muxer 
Originally committed as revision 25413 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 12:05:04 +00:00
Martin Storsjö
6898677e54 sdp: Only specify the TTL for IPv4 addresses 
According to RFC 4566, a TTL value must not be present for IPv6 multicast.

Originally committed as revision 25412 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 11:58:47 +00:00
Martin Storsjö
a493f80a2c rtsp: Factorize out code for opening a chained RTP muxer 
The new object file is added to the SDP demuxer in the makefile, since it
is needed in both the RTSP muxer and demuxer and in the SDP demuxer, due
to the current code coupling.

Originally committed as revision 25410 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 08:54:53 +00:00
Martin Storsjö
3d74223025 rtsp: Make rtsp_rtp_mux_open reusable 
Originally committed as revision 25409 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 08:51:05 +00:00
Martin Storsjö
9e6acc7884 rtsp: Remove the start_time field from RTSPState, use AVFormatContext->start_time_realtime instead 
Originally committed as revision 25408 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 08:50:29 +00:00
Martin Storsjö
25968c3953 Reindent 
Originally committed as revision 25406 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 08:43:10 +00:00
Martin Storsjö
6766a354f7 udp: Add an option for connecting the udp socket 
This allows us to find out the local sending address via getsockname,
otherwise we just get INADDR_ANY (or similar for v6).

This also makes writes return ECONNREFUSED if nobody is listening on the
receiving port.

Originally committed as revision 25405 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 08:42:30 +00:00
Martin Storsjö
b7952ed184 rtpdec: Set prev_ret properly when parsing more data from mpegts RTP packets 
Originally committed as revision 25404 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 08:40:08 +00:00
Martin Storsjö
45658b7414 rtpdec: Store the previous return value for mpegts when it was -1, too 
Originally committed as revision 25403 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 07:28:17 +00:00
Robert Schlabbach
243ac3fdaa rtpdec: Keep track of the previous return value from rtp_parse_packet_internal for mpegts packets 
Patch by Robert Schlabbach, robert_s at gmx dot net

Originally committed as revision 25402 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 07:26:42 +00:00
Baptiste Coudurier
8a451afe7d In gxf muxer, round up number of lines mod 16 in mpeg umf data, based patch by Reuben Martin, reuben dot m at gmail dot com 
Originally committed as revision 25401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:41:04 +00:00
Baptiste Coudurier
c6d04addf6 In gxf muxer, fix number of flt entries based on patch by Reuben Martin, reuben dot m at gmail dot com 
Originally committed as revision 25399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:35:55 +00:00
Reuben Martin
82ae56b3fa In gxf muxer, write umf media for mpeg1video, patch by Reuben Martin, reuben dot m at gmail dot com 
Originally committed as revision 25396 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:17:06 +00:00
Reuben Martin
ad4c3c6840 In gxf muxer, fix flt entry offset, patch by Reuben Martin, reuben dot m at gmail dot com 
Originally committed as revision 25395 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:15:35 +00:00
Aurelien Jacobs
e99179de9b remove useless local variable 
Originally committed as revision 25394 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:10:51 +00:00
Aurelien Jacobs
3e4318bf4a remove useless local allocated start_time array 
Originally committed as revision 25393 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:05:31 +00:00
Martin Storsjö
87b2b40a33 Reindent 
Originally committed as revision 25390 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 08:00:03 +00:00
Martin Storsjö
10105c9b29 sdp: Don't require the explicit ?multicast option 
No such option is used anywhere else. Instead, detect the address type.

Originally committed as revision 25389 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 07:59:35 +00:00
Martin Storsjö
55b6bd1c01 Convert ff_is_multicast_address to take a struct sockaddr parameter 
Not all users of this function will have a full struct sockaddr_storage
available, and casting other sockaddrs to sockaddr_storage is wrong,
while any sockaddr can be cast to a base sockaddr.

Originally committed as revision 25388 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 07:58:56 +00:00
Martin Storsjö
7ac57fa5eb Share the is_multicast_address function 
The header probably isn't the right permanent place for this function, but
it is quite small, and consensus seems to be that it can stay in the
header for now, instead of creating a new file network.c just for this one.

Originally committed as revision 25387 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 07:54:52 +00:00
Martin Storsjö
f63630cdf3 Move multicast address identification fallback macros to network.h from udp.c 
Originally committed as revision 25386 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 07:53:31 +00:00
Michael Niedermayer
34b9e5bc4f Warn if muxing mpeg ps is attempted without a VBV buffer size. 
Originally committed as revision 25385 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 01:57:39 +00:00
Michael Niedermayer
9b272e3274 Init SCR in mpeg muxer based on first DTS. 
This fixes issues if the first DTS is far away from 0.

Originally committed as revision 25383 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 00:32:22 +00:00
Aurelien Jacobs
61138c43e0 properly check for FF_API_MAX_STREAMS instead of LIBAVFORMAT_VERSION_MAJOR 
Originally committed as revision 25382 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 21:43:46 +00:00
Aurelien Jacobs
38aab35f47 add new streams API without MAX_STREAMS limit 
(disabled until next major bump)

Originally committed as revision 25381 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 20:56:14 +00:00
Aurelien Jacobs
feb2440c38 dynamically use nb_streams instead of static use of MAX_STREAMS 
Originally committed as revision 25380 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 20:52:26 +00:00
Aurelien Jacobs
2899a28cdc document the fact that av_new_stream() can't be called in a background thread 
Originally committed as revision 25379 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 20:49:25 +00:00
Reimar Döffinger
6612d8cf31 Move handling of ID3v2 to common utils.c code, reducing code duplication 
and supporting it for more formats, fixing issue 2258.

Originally committed as revision 25378 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 20:21:07 +00:00
Stefano Sabatini
85c15960b4 Move the definitions of AVSEEK_SIZE to make it appear before the 
description of url_seek(), which references it.

Originally committed as revision 25376 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 18:42:46 +00:00
Robert Schlabbach
9446b4bbbc rtpdec: Handle RTP header extension 
This fixes roundup issue 2270.

Patch by Robert Schlabbach, robert_s at gmx dot net

Originally committed as revision 25372 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 16:59:14 +00:00
Martin Storsjö
3ece3e4c56 Add RTP depacketization of the X-QT QuickTime format 
Originally committed as revision 25371 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 12:42:18 +00:00
Carl Eugen Hoyos
0ada32c373 Remove unused variable. 
Originally committed as revision 25369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 11:40:09 +00:00
Michael Niedermayer
fe5feaeb76 Use retry_transfer_wrapper() in url_write() as its callers do not expect it to stop in the middle. 
Originally committed as revision 25368 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 11:18:43 +00:00
Michael Niedermayer
a46f7516ec Factor retry_transfer_wrapper() out of url_read_complete() 
Originally committed as revision 25367 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 11:18:38 +00:00
Martin Storsjö
2f412421e8 movdec: Free the previous extradata 
If multiple stsd atoms are parsed for the same stream, the old
extradata would be leaked.

Originally committed as revision 25360 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 21:36:30 +00:00
Martin Storsjö
dc2cabd003 movdec: Split out ff_mov_read_stsd 
Originally committed as revision 25359 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 21:35:44 +00:00
Anton Khirnov
ec4913a8ae vorbiscomment: add DISCNUMBER to the metadata conv table 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25357 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 20:11:07 +00:00
Martin Storsjö
5fe8021a6a rtsp/sdp: Move code into correct ifdefs 
This makes the code dependencies correct. Previously, the SDP demuxer
wasn't buildable on its own.

This also reverts rev 25343.

Originally committed as revision 25354 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 19:46:25 +00:00
Martin Storsjö
eb99f179fa find_info_tag: Make sure the output buffer is null terminated 
Originally committed as revision 25353 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 19:33:56 +00:00
Martin Storsjö
5961253463 udp: Define _DARWIN_C_SOURCE 
This is required in order to get the IP_MULTICAST_TTL define.

Originally committed as revision 25351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 16:35:33 +00:00
Martin Storsjö
25a2ebb917 udp: Return the actual error code on errors, instead of AVERROR(EIO) 
Originally committed as revision 25350 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 14:09:30 +00:00
qrtt1
42f9582d8d Set proper error if server flags indicate that it doesn't support mmst. This 
prevents a read-after-close-induced segfault later. Fixes issue 2266.

Patch by qrtt1 <chingyichan dot tw gmail com>.

Originally committed as revision 25349 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 14:04:46 +00:00
Tobias Bindhammer
2a26520a97 Cosmetics, lots of. 
Originally committed as revision 25348 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 12:14:30 +00:00
Diego Biurrun
a44da176ac Remove some pointless CONFIG_RTSP_DEMUXER #ifdefs. 
They reside within a large CONFIG_RTSP_DEMUXER block and are thus pointless.

Originally committed as revision 25343 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 11:06:32 +00:00
Diego Biurrun
2e802e3855 Add some #endif comments to ease understanding. 
Originally committed as revision 25342 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 11:03:48 +00:00
Anton Khirnov
9b75309c19 matroskaenc: write metadata 
patch by Anton Khirnov   anton _at_ khirnov _dot_ net

Originally committed as revision 25341 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 09:40:43 +00:00
Baptiste Coudurier
c9b8762856 xdcam hd422 720p24 fourcc in mov 
Originally committed as revision 25336 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-04 20:23:36 +00:00
Aurelien Jacobs
0f02a7e2d2 mms: remove dependency on MAX_STREAM API 
Originally committed as revision 25335 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-04 19:45:12 +00:00
Martin Storsjö
7fe3c270c0 rtpdec_svq3: Don't look for the unused RTP_FLAG_KEY flag 
Originally committed as revision 25327 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-03 18:55:46 +00:00
Martin Storsjö
d7810f4541 rtsp: In the muxer, show the generated with verbose log level 
It is only useful for debugging, so it doesn't have to be shown every time.

Originally committed as revision 25323 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-03 11:56:38 +00:00
Martin Storsjö
6ecd741713 rtsp: Show the received SDP 
Originally committed as revision 25322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-03 11:55:16 +00:00
Benjamin Larsson
62784e3733 Add the CODEC_CAP_CHANNEL_CONF capability code and add 
that flag to the dca codec. This capability when set
will make sure the codec will initialize the channel
configuration instead of trusting the container. This
fixes issue 2137 and issue 850.

Originally committed as revision 25320 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 22:18:02 +00:00
Martin Storsjö
ae8c28db87 applehttp: Add comments to make_absolute_url 
Originally committed as revision 25319 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 21:59:16 +00:00
Martin Storsjö
9d229ef9e6 applehttp: Handle a .. path segment in the base url 
Originally committed as revision 25318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 21:58:36 +00:00
Martin Storsjö
978a5ce82e Reindent 
Originally committed as revision 25317 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 21:58:13 +00:00
Martin Storsjö
8f7c2452de applehttp: Allow the base url to be a local file name, too 
Originally committed as revision 25316 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 21:57:58 +00:00
Stefano Sabatini
8bf256bcc0 Document url_get_filename(). 
Originally committed as revision 25310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 09:16:52 +00:00
Aurelien Jacobs
dba249abee ffmpeg: add a grow_array() helper function 
Originally committed as revision 25297 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:29:37 +00:00
Martin Storsjö
321259c1ab rtsp: Return a queued packet if it has been in the queue for longer than max_delay 
Originally committed as revision 25295 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:52:26 +00:00
Martin Storsjö
58ee09911e rtpdec: Reorder received RTP packets according to the seq number 
Reordering is enabled only when receiving over UDP.

Originally committed as revision 25294 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:50:24 +00:00
Martin Storsjö
0260741876 rtpdec: Split out the part of rtp_parse_packet that does the parsing of new packets 
Originally committed as revision 25293 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:46:10 +00:00
Reimar Döffinger
27af8902c4 Fix indentation of ff_id3v2_read 
Originally committed as revision 25292 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:45:18 +00:00
Martin Storsjö
c690fa97e5 Reindent/rewrap 
Originally committed as revision 25291 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:44:53 +00:00
Martin Storsjö
38f8c80b62 rtsp: Reorganize if statements in rtsp_read_play 
Originally committed as revision 25290 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:44:18 +00:00
Martin Storsjö
ad4ad27fb6 rtsp/rtpdec: Allow rtp_parse_packet to take ownership of the packet buffer 
Do the same change for ff_rdt_parse_packet, too, to keep the interfaces
similar.

Originally committed as revision 25289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:43:27 +00:00
Martin Storsjö
96a7c9753e rtsp: Use a dynamically allocated receive buffer 
Originally committed as revision 25288 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 17:41:31 +00:00
Tomas Härdin
8878e3b21b Add demuxer for LXF (Leitch/Harris' VR native stream format) 
Originally committed as revision 25281 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 11:08:24 +00:00
Baptiste Coudurier
d8e456400e Correct tag is m2v1 
Originally committed as revision 25271 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-30 18:12:27 +00:00
Stefano Sabatini
f3f5eb6e70 Document url_filesize(). 
Originally committed as revision 25268 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-30 10:55:08 +00:00
Stefano Sabatini
0a216bd1dd Make register_protocol() use the function av_register_protocol2() 
rather than av_register_protocol(), which is deprecated.
Fix the GCC warning:
avio.c: In function ‘register_protocol’:
avio.c:93: warning: ‘av_register_protocol’ is deprecated (declared at avio.c:86)

Originally committed as revision 25267 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-30 10:51:22 +00:00
Baptiste Coudurier
826481ea91 Remove duplicate entries 
Originally committed as revision 25264 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-29 21:35:52 +00:00
Baptiste Coudurier
3432c26319 Use new apple fourcc for mpeg-1 and mpeg-2 in mov, works natively on osx 
Originally committed as revision 25263 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-29 21:34:31 +00:00
Ronald S. Bultje
3dedbeff7b Check return value of get_chunk_header(). Since enum can be unsigned, the 
current code wouldn't always error out on errors.

Based on patch by Stephen d'Angelo <sdangelo evertz com>.

Originally committed as revision 25260 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-29 15:43:36 +00:00
Baptiste Coudurier
6d19fd5c26 In mov demuxer, check that nb_streams is valid before using it in read_dac3 
Originally committed as revision 25240 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-28 00:33:21 +00:00
Michael Chinen
59cb40b921 Fix index_entries pos: 
It was being set wrong for files with data_offset > 0

Patch by Michael Chinen, mchinen gmail

Originally committed as revision 25239 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-27 22:17:58 +00:00
Martin Storsjö
4a94cfea02 rtpproto: Use a sockaddr_storage instead of a sockaddr_in with recvfrom 
Originally committed as revision 25224 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-27 16:10:23 +00:00
Tomas Härdin
1620939022 mpegtsenc: Indent 
Originally committed as revision 25222 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-27 12:27:26 +00:00
Tomas Härdin
d1ac03517e mpegtsenc: Write subtitle extradata if set 
Originally committed as revision 25221 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-27 12:27:23 +00:00
Michael Niedermayer
6ed040408b Move AVOptions from libavcodec to libavutil 
Originally committed as revision 25210 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-26 14:25:22 +00:00
Kostya Shishkov
cba322d76d Make WMV3 decoder attempt to decode WMVP as well 
Originally committed as revision 25209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-26 13:56:50 +00:00
Stefano Sabatini
b9f9e59afc Replace deprecated CODEC_TYPE_AUDIO and CODEC_TYPE_VIDEO with the 
corresponding AVMEDIA_TYPE_* symbols.

Originally committed as revision 25201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-25 23:27:16 +00:00
Martin Storsjö
6df4029549 Add an AVOption max_delay for AVFormatContext->max_delay 
This can currently also be set via -muxdelay in ffmpeg for muxers,
but not for demuxers (nor for demuxers in ffplay) - this patch
allows it to be set in all those cases.

Originally committed as revision 25180 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-24 18:04:21 +00:00
Carl Eugen Hoyos
b7d56a17ae Fix indentation after r25158. 
Originally committed as revision 25160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-23 09:53:26 +00:00
Richard Buteau
6ac6e3d123 Fix aspect ratio for files that have it stored in 
ff_asf_extended_content_header.
Fixes issue 690.

Patch by Richard Buteau, rbuteau rgbnetworks com

Originally committed as revision 25158 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-23 03:40:06 +00:00
Diego Biurrun
26d5112c57 cosmetics: Place concat protocol entry in alphabetical order. 
Originally committed as revision 25155 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-21 22:21:12 +00:00
Martin Storsjö
b416267622 tcp: Check both wfds and efds when waiting for the result from connect 
On windows, a connection failure doesn't trigger wfds as it does on unix.

This fixes issue 2237, based on code by yeyingxian.

Originally committed as revision 25154 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-21 20:17:34 +00:00
Martin Storsjö
63206a8ffb Check for the IPPROTO_IPV6 define before using it 
This fixes building on FreeBSD in some configurations, if the IPv6 multicast
structs are available, but IPPROTO_IPV6 isn't defined.

Originally committed as revision 25147 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-20 06:38:40 +00:00
Martin Storsjö
160918d588 rtsp: Handle standard assigned codec names for private payload types, too 
Originally committed as revision 25126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-15 17:39:25 +00:00
Martin Storsjö
0048a2a8d3 Handle G.722 in RTP, and all the exceptions mandated in RFC 3551 
Originally committed as revision 25125 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-15 17:35:39 +00:00
Michael Niedermayer
4faf628f20 Clarify what av_read_frame() returns. 
Originally committed as revision 25123 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-14 22:20:46 +00:00
Zhou Zongyi
4383692896 Add R10k decoder. 
Original patch by Zhou Zongyi, zhouzy A os pku edu cn, resubmitted by
James Darnley, james.darnley gmail, changes by me.

Originally committed as revision 25115 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-13 22:08:51 +00:00
David Byron
0c41d554e2 Read all id3v2 tags at the beginning of mp3 files. 
Patch by David Byron, dbyron dbyron com

Originally committed as revision 25105 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-11 16:29:23 +00:00
Tomás Touceda
16f825085a FLV Metadata 
Patch by Tomás Touceda, chiiph gentoo org

Originally committed as revision 25101 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-10 23:29:07 +00:00
Måns Rullgård
324d22b2b4 nutenc: fix unstable floating-point calculations 
Originally committed as revision 25095 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-10 13:16:08 +00:00
Alex Converse
20de72a447 adts demuxer: Set the time base to be the LCM of all ADTS sample rates. 
Originally committed as revision 25091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-09 23:15:17 +00:00
Martin Storsjö
9013560f13 Add a muxer and demuxer for raw G.722 
Originally committed as revision 25087 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-09 19:27:41 +00:00
Baptiste Coudurier
6bd296f1e4 In mov muxer, write reduced sample aspect ratio values in pasp 
Originally committed as revision 25082 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-08 20:22:02 +00:00
Baptiste Coudurier
0e7d436d92 Check dref size based on a patch by google 
Originally committed as revision 25081 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-08 20:20:24 +00:00
Baptiste Coudurier
9044dd8399 In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539 
Originally committed as revision 25080 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-08 20:18:14 +00:00
Christian d'Heureuse
b163078fe3 Fix formatting for negative start times (issue 2139). 
Patch by Christian d'Heureuse, chdh inventec ch

Originally committed as revision 25063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-07 21:06:21 +00:00
Justin Ruggles
bdecdd2bfc Read the number of channels from the 'dac3' tag for AC-3 in MP4. 
Originally committed as revision 25054 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-06 21:52:11 +00:00
Reimar Döffinger
1b4d327b1c Add a special function to mkv demxuer to parse length values that includes 
special-case code to handle all possible encodings of "unknown length".

Originally committed as revision 25049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-06 17:51:44 +00:00
Aurelien Jacobs
b004207df4 move stream info arrays into a struct to ease future dynamic allocation 
Originally committed as revision 25045 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-05 22:25:45 +00:00
Aurelien Jacobs
4a194c8f47 matroskadec: allow uint and float elements with length = 0 
Originally committed as revision 25044 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-05 21:37:40 +00:00
Ronald S. Bultje
f0d8ac529f Move INET6_ADDRSTRLEN to network.h, similar to other network-related fixups 
for broken OSes. This is included in rtsp.h, as opposed to os_support.h.
Should fix OS/2 broken build on fate.

Originally committed as revision 25035 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-03 20:06:01 +00:00
James Darnley
521d434fd5 Vorbis metadata writing. Patch by James Darnley <james.darnley gmail com>. 
Fixes issue 555.

Originally committed as revision 25034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-03 19:30:27 +00:00
Ronald S. Bultje
7bac991fd9 Reindent after r25032. 
Originally committed as revision 25033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-03 19:26:27 +00:00
John Wimer
619298a84d Send NAT punching messages to the address specified in the Transport: 
message, if available (RFC 2326, section 12.39), fixes issue 2212.

Patch by John Wimer <john at god vtic net>.

Originally committed as revision 25032 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-03 19:25:59 +00:00
Martin Storsjö
8bb90c5394 Set frame_size in the amr demuxer 
Originally committed as revision 25030 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-03 14:59:18 +00:00
Martin Storsjö
744a882f6c rtsp: 10l, try to update the correct rtp stream 
This fixes a bug from rev 22917. Now RTSP streams where the individual RTCP
sender reports aren't sent at the same time actually are synced properly.

Originally committed as revision 25029 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-03 07:10:21 +00:00
Reimar Döffinger
ff6a5fc1f0 Optimize/simplify ebml_read_num. 
Originally committed as revision 25026 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-02 19:17:46 +00:00
Carl Eugen Hoyos
2b50c4f6cc Cosmetics: Reindent after r25023. 
Originally committed as revision 25024 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-02 11:53:09 +00:00
Andrew Wason
4ed899f2c5 Fix crash when decoding DV in AVI introduced in r24579 (issue 2174). 
Patch by Andrew Wason, rectalogic rectalogic com

Originally committed as revision 25023 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-02 11:51:32 +00:00
Baptiste Coudurier
e66f8a5389 cosmetics: spaces between and after parentheses 
Originally committed as revision 25021 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-01 22:58:39 +00:00
Baptiste Coudurier
eeeae2bf05 gxf muxer only accepts pal or ntsc resolutions currently, so fail if resolution is something else 
Originally committed as revision 25014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-01 00:04:47 +00:00
Tobias Bindhammer
8731c86d03 Solving memory leak and initialization problem with prev_pkt / pkt. 
Originally committed as revision 25004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-31 07:15:11 +00:00
Aurelien Jacobs
4ca31edcfe split raw.c into rawdec.c and rawenc.c 
Originally committed as revision 24997 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-30 23:16:35 +00:00
Aurelien Jacobs
92aa28d292 move raw video demuxer to its own file 
Originally committed as revision 24996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-30 22:53:16 +00:00
Aurelien Jacobs
f1714d5846 move pcm muxers to their own file 
Originally committed as revision 24995 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-30 22:42:25 +00:00
Aurelien Jacobs
e94204dfd8 move pcm demuxers to their own file 
Originally committed as revision 24993 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-30 21:17:34 +00:00
Ben Littler
f0feb4d72f add WAWV fourcc, works on V-codecs/WAWV.avi 
Originally committed as revision 24991 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-30 16:43:33 +00:00
Aurelien Jacobs
4bc16e83a7 simplify code by using the AV_NE() macro 
Originally committed as revision 24986 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 22:21:29 +00:00
Aurelien Jacobs
8f3890404c move null muxer to its own file 
Originally committed as revision 24985 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 22:15:50 +00:00
Aurelien Jacobs
1ac301cad8 cleanup includes which are not used anymore in raw.c 
Originally committed as revision 24984 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 22:06:48 +00:00
Aurelien Jacobs
9e0d82418b move ac3/eac3 demuxer to its own file 
Originally committed as revision 24983 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 22:02:47 +00:00
Aurelien Jacobs
66e35c5fc6 move dnxhd demuxer to its own file 
Originally committed as revision 24982 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 21:51:47 +00:00
Aurelien Jacobs
170a250f7d move dirac demuxer to its own file 
Originally committed as revision 24981 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 21:44:26 +00:00
Aurelien Jacobs
99392a6111 move h261 demuxer to its own file 
Originally committed as revision 24980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 21:37:37 +00:00
Aurelien Jacobs
b30593c7db move h263 demuxer to its own file 
Originally committed as revision 24979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 21:34:18 +00:00
Aurelien Jacobs
9243ed3f91 move h264 demuxer to its own file 
Originally committed as revision 24978 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 21:28:51 +00:00
Aurelien Jacobs
187186c600 cosmetic 
Originally committed as revision 24977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 21:23:52 +00:00
Aurelien Jacobs
e35070582e move m4v demuxer to its own file 
Originally committed as revision 24976 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 21:23:30 +00:00
Aurelien Jacobs
c3ed4b2d38 move cavsvideo demuxer to its own file 
Originally committed as revision 24975 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 21:14:55 +00:00
Aurelien Jacobs
8c51530fa1 move mpegvideo demuxer to its own file 
Originally committed as revision 24974 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 20:36:23 +00:00
Aurelien Jacobs
b47a5a954a move ingenient demuxer to its own file 
Originally committed as revision 24973 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 19:16:04 +00:00
Aurelien Jacobs
6d0678d182 move DTS demuxer to its own file 
Originally committed as revision 24972 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 19:00:40 +00:00
Aurelien Jacobs
85a2aada90 simplify code by using the AV_NE() macro 
Originally committed as revision 24971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 18:33:39 +00:00
Aurelien Jacobs
26aa681111 10l: aacdec and idroqenc still depend on raw.o 
Originally committed as revision 24970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 18:28:03 +00:00
Aurelien Jacobs
2aa751d2c8 rename idroq.c to idroqdec.c 
Originally committed as revision 24969 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 16:37:33 +00:00
Aurelien Jacobs
54a73bb57f move id roq muxer to its own file 
Originally committed as revision 24968 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 16:35:44 +00:00
Aurelien Jacobs
49824cb66a move ADTS AAC demuxer to its own file 
Originally committed as revision 24967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 16:18:20 +00:00
Josh Allmann
b20359f51a rtsp: Return AVERROR_EOF when all streams have received an RTCP BYE packet 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24965 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 10:25:16 +00:00
Josh Allmann
682d28a965 Reindent 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24964 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 10:20:18 +00:00
Josh Allmann
ff328c0225 rtpdec: Read RTCP compound packets 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24963 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 10:19:44 +00:00
Josh Allmann
a1ba71aace rtsp: Check the RTCP file handle for new packets, too 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24962 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-29 10:16:54 +00:00
Ronald S. Bultje
6a1712ddb5 Fix two compiler arnings related to printf-format of sizeof()-statements. 
Originally committed as revision 24961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-28 23:56:56 +00:00
Zhentan Feng
37c506e8b9 stream_selection can be freed in the fail case, in which case it's unassigned. 
Therefore, init it with NULL to prevent a crash on invalid streams.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24960 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-28 23:55:26 +00:00
Tobias Bindhammer
133cc989dd Cosmetic changes. 
Originally committed as revision 24944 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-26 10:03:14 +00:00
Tobias Bindhammer
2fdb2b5438 Insert info from extradata into header 
Originally committed as revision 24943 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-26 10:03:11 +00:00
Tobias Bindhammer
9e906bb1bf Added option to write frames interleaved (yet disabled) 
For this reason, a MuxerContext and write_trailer()-function was added,
to track the previous packet and flush the last packet at the end.

Originally committed as revision 24942 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-26 10:03:09 +00:00
Andreas Öman
f06d6c751f Make stub version of ff_sdp_write_media() match its prototype 
Used when compiled without CONFIG_RTP_MUXER

Fallout from r24915

Originally committed as revision 24935 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 21:07:04 +00:00
Josh Allmann
186f1ec5f4 Add rtp_get_rtcp_file_handle function 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24929 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 17:32:59 +00:00
Martin Storsjö
7934b15d5a Handle IPv6 in the RTSP code 
Originally committed as revision 24925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 15:32:29 +00:00
Martin Storsjö
3fbd12d109 Handle IPv6 in the SDP demuxer 
Originally committed as revision 24924 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 15:32:00 +00:00
Martin Storsjö
2401660d2f rtsp: Return EOF if the TCP control channel is closed 
Originally committed as revision 24920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 13:42:17 +00:00
Martin Storsjö
5a8693ef59 Reindent 
Originally committed as revision 24919 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 13:31:33 +00:00
Martin Storsjö
7ad526d288 Simplify resolve_destination in sdp.c further, now that we don't enforce IPv4 any longer 
Originally committed as revision 24918 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 13:30:06 +00:00
Martin Storsjö
1272ae7e50 10l, add new function parameters to resolve_destination for !config_network too 
Originally committed as revision 24917 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 12:51:20 +00:00
Martin Storsjö
cc83027c67 Reindent, rewrap lines 
Originally committed as revision 24916 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 12:34:42 +00:00
Martin Storsjö
7ad1dc5447 Properly handle IPv6 addresses in the SDP generation 
Originally committed as revision 24915 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 12:29:32 +00:00
Josh Allmann
7f3468d392 rtp: Replace hardcoded RTCP packet types with defines 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-25 09:15:31 +00:00
Måns Rullgård
668338c573 avformat: free decryption key in av_close_input_stream() 
Originally committed as revision 24899 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-24 15:08:53 +00:00
Tobias Bindhammer
bb07ab7cf2 fixed some return values and deprecated CODEC_TYPE_VIDEO. 
dithering (faster) along a linear gradient now.

Originally committed as revision 24898 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-24 14:02:31 +00:00
Måns Rullgård
ac9c19da66 asfcrypt: fix unaligned accesses with armcc 
Compilers may assume a pointer has natural alignment, even if it was
assigned from a pointer type with weaker alignment requirements.  It
is thus not safe to assign a possibly unaligned value to a pointer,
regardless of how it is subsequently dereferenced.

Originally committed as revision 24897 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-24 13:42:28 +00:00
Måns Rullgård
e955bf3b42 asfcrypt: fix unaligned read in ff_asfcrypt_dec() 
Originally committed as revision 24886 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-23 15:38:57 +00:00
Luca Abeni
952139a322 Do not use the server SSRC as client SSRC in the RTP demuxer 
Originally committed as revision 24879 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-23 11:53:27 +00:00
Tobias Bindhammer
b7cf4e4f55 enabling codec and muxer by registering it in allcodec.c and allformat.c and adding files to the build-system 
Originally committed as revision 24878 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-23 11:52:34 +00:00
Tobias Bindhammer
901694f160 Corresponding muxer for the a64 codec 
Originally committed as revision 24875 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-23 11:47:50 +00:00
Ronald S. Bultje
f5ea69b235 MMSH support, the most popular and widely used of all MMS variants. Written by 
Zhentan Feng <spyfeng gmail com> as part of Google's Summer of Code program.

Originally committed as revision 24861 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-21 19:04:41 +00:00
Aurelien Jacobs
364cacc7c7 add FF_API_URL_RESETBUF define to disable the deprecated url_resetbuf() 
public function

Originally committed as revision 24841 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-19 21:28:43 +00:00
Aurelien Jacobs
838b27b42c add FF_API_REGISTER_PROTOCOL define to disable the deprecated 
register_protocol() function

Originally committed as revision 24840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-19 21:21:32 +00:00
Måns Rullgård
b2125520e7 applehttp: define _XOPEN_SOURCE=600 as required for usleep() 
Originally committed as revision 24839 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-19 17:07:12 +00:00
Aurelien Jacobs
404eba44b1 add FF_API_URL_CLASS define to enable usage of URLContext as a AVClass 
Originally committed as revision 24835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-19 16:49:08 +00:00
Martin Storsjö
cd223e0b4e Add Apple HTTP Live Streaming demuxer 
Originally committed as revision 24834 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-19 14:54:37 +00:00
Martin Storsjö
e55ebcc3f6 Move the definition of the maximum url size for static buffers to internal.h 
Originally committed as revision 24833 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-19 14:50:40 +00:00
Martin Storsjö
f9c399c4fd Make parse_key_value from httpauth a common lavf internal function 
Originally committed as revision 24832 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-19 14:49:53 +00:00
Aurelien Jacobs
25ae798c87 add a comment to clarify that FF_API_* defines are not part of public API 
Originally committed as revision 24826 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-18 20:37:32 +00:00
Aurelien Jacobs
54036be11a rename LAVF_API_* defines to FF_API_* to clarify that it is not public API 
Originally committed as revision 24825 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-18 20:34:31 +00:00
Alexander Kojevnikov
18bbe9df9a Support unsynchronisation for id3v2 tags. 
Patch by Alexander Kojevnikov, alexander kojevnikov com

Originally committed as revision 24824 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-18 16:29:46 +00:00
Thierry Foucu
df4f1d5108 Add AVC EOS tag to H264-encoded FLV files. 
Patch by Thierry Foucu, tfoucu gmail

Originally committed as revision 24820 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-18 09:39:21 +00:00
Aurelien Jacobs
dd872bf49f add LAVF_API_OLD_METADATA define to disable the deprecated metadata API 
Originally committed as revision 24818 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 20:23:19 +00:00
Aurelien Jacobs
072e3efd1b add LAVF_API_MAX_STREAMS define to disable the deprecated MAX_STREAMS API 
Originally committed as revision 24817 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 19:30:21 +00:00
Aurelien Jacobs
e110e968fe matroskadec: minor simplification 
patch from reimar

Originally committed as revision 24804 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 14:25:14 +00:00
Aurelien Jacobs
4f90688b6e matroskadec: fix integer overflow 
patch from reimar

Originally committed as revision 24803 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-17 14:05:23 +00:00
Josh Allmann
51291e6005 Add RTP depacketization of VP8 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24798 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-16 14:23:35 +00:00
Josh Allmann
7b18d94cb3 Add RTP packetization of VP8 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24797 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-16 14:21:17 +00:00
Ronald S. Bultje
63638a3c4a Print error messages in case of connection failure or name resolution failure 
in tcp.c.

Originally committed as revision 24796 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-14 20:34:51 +00:00
Ronald S. Bultje
afbc4d2dac Prevent overflow on random input. 
Originally committed as revision 24795 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-13 20:06:18 +00:00
Ronald S. Bultje
67197656d1 Remove use of MAX_STREAMS in MMSContext->streams[] array. Instead, dynamically 
allocate the array.

Originally committed as revision 24794 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-13 17:30:01 +00:00
Zhentan Feng
c46000c1ff Set fixed chunksize for ASF header in MMS streams, as per MSDN documentation. 
This fixes playback of at least one MMST stream.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24793 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-13 17:08:57 +00:00
Zhentan Feng
99ab8ff049 Fix wrong command prefix for timing test in MMST protocol. 
Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24792 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-13 17:02:37 +00:00
Martin Storsjö
1ddc176ec4 Add RTP depacketization of MP4A-LATM 
Originally committed as revision 24790 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-12 21:07:17 +00:00
Ronald S. Bultje
27014bf5a3 Send OPTIONS request at a regular basis to standard RTSP servers as well, 
this prevents a time-out which closes the TCP connection and kills our
session.

see "Re: [FFmpeg-devel] [PATCH] rtsp.c: keep-alive" thread on mailinglist.

Originally committed as revision 24785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-12 13:39:38 +00:00
Ronald S. Bultje
d68776d54f Add another missing file from r24799. 
Originally committed as revision 24784 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-12 02:01:33 +00:00
Baptiste Coudurier
d2064fd42b Fix segv when stream copy and validate_tag fails, st->codec->codec is not set 
Originally committed as revision 24782 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-12 00:35:19 +00:00
Ronald S. Bultje
6ef14e5753 Add missing mms.c from r24779. 
Originally committed as revision 24780 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 23:45:05 +00:00
Zhentan Feng
fcd11c61ea Move functions and structs shared between MMSH and MMST into their own file, 
mms.c. Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24779 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 22:50:17 +00:00
Zhentan Feng
edce93536a Extract fields that are to be shared between MMST/MMSH into a common struct, 
MMSContext. The other MMST-specific members go into MMSTContext.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24778 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 22:43:54 +00:00
Ronald S. Bultje
a46cd6e141 Use FFALIGN() in mmst.c where appropriate. Noticed by Benoit Fouet. 
Originally committed as revision 24777 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 22:27:29 +00:00
Stefano Sabatini
983ec30497 Add documentation for the pm parameter of the av_metadata_set* 
functions.

Originally committed as revision 24771 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 14:38:19 +00:00
Stefano Sabatini
32e6f246b3 Fix reference to a wrong parameter name in the metadata API functions 
doxies.

Originally committed as revision 24770 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 14:38:16 +00:00
Stefano Sabatini
fd7b11d027 Nit: fix weird spacing. 
Originally committed as revision 24762 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 09:13:58 +00:00
Stefano Sabatini
26cc5310f6 Add empty newlines between function descriptions and @params, improve 
readability.

Originally committed as revision 24761 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 09:13:53 +00:00
Przemysław Sobala
ec973f45a3 Fix mem leak when trying to open a non-existing image file (issue 2126). 
Patch by Przemysław Sobala, psobala wp-sa pl

Originally committed as revision 24757 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-10 17:27:22 +00:00
Aurelien Jacobs
3c0eec06d8 get rid of MAX_STREAMS limit in nutdec 
Originally committed as revision 24755 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-10 16:36:36 +00:00
Martin Storsjö
f53b9a2964 rtpenc_xiph: Clarify that num_frames shouldn't ever get larger than max_frames_per_packet 
Originally committed as revision 24754 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-10 08:37:19 +00:00
Aurelien Jacobs
6b2b337657 get rid of MAX_STREAMS limit in mpegts 
Originally committed as revision 24753 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-09 23:21:08 +00:00
Aurelien Jacobs
be73ba2fa4 get rid of MAX_STREAMS limit in RTSP 
Originally committed as revision 24752 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-09 23:00:13 +00:00
Aurelien Jacobs
dfdb353cd5 get rid of MAX_STREAMS limit in RDT 
Originally committed as revision 24751 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-09 22:58:54 +00:00
Martin Storsjö
b5c4bb989d rtpenc_xiph: Set the ident value via a define 
Originally committed as revision 24749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-09 10:31:59 +00:00
Martin Storsjö
62c7e2c336 rtpenc_xiph: Don't needlessly cast pointers to integers 
Originally committed as revision 24748 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-09 10:23:26 +00:00
Martin Storsjö
311baee795 Make hex_to_data a lavf internal function 
This is useful for other future RTP depacketizers

Originally committed as revision 24747 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-09 10:05:33 +00:00
Martin Storsjö
f240ed18ef http: Return EOF at the end of the content even if the connection isn't closed 
We do request Connection: close, but some servers ignore it.

Originally committed as revision 24746 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-09 08:14:48 +00:00
Alex Converse
73c44cb286 oggparsevorbis: Add some sanity checks to header packet ordering/presence. 
Originally committed as revision 24740 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-07 21:30:34 +00:00
Reinhard Tartler
2901cc9a95 Fix spelling in comment(s) 
Originally committed as revision 24737 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-07 14:11:43 +00:00
Josh Allmann
91af5601c1 Add RTP packetization of Theora and Vorbis 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-07 11:16:07 +00:00
Luca Barbato
d93fdcbf5c Preserve status reason 
It is used to provide meaningful error messages.

Originally committed as revision 24714 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-06 10:26:30 +00:00
Martin Storsjö
504de2ec8f rtpdec_xiph: Split packets in the depacketizer 
The vorbis decoder doesn't handle more than one audio frame packed into
the same AVPacket, so they need to be split in the depacketizer.

Originally committed as revision 24704 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-05 04:42:36 +00:00
Zhentan Feng
aaa91aa00e Move read_mms_packet() code to be inlined in the calling function. 
Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24700 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-04 22:34:43 +00:00
Zhentan Feng
05fc9a1bcf Remove is_playing variable. 
Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24699 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-04 22:33:38 +00:00
Zhentan Feng
b949875bf6 Move send_media_packet_request() and clear_stream_buffers() up. 
Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24698 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-04 22:32:43 +00:00
Martin Storsjö
737b3972b5 rtpdec_xiph: Correct the bitmask for num_pkts 
Originally committed as revision 24696 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-04 17:22:25 +00:00
Benoit Fouet
eea72ee863 Fix doxygen comment. 
Originally committed as revision 24663 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-02 07:28:35 +00:00
Alex Converse
f7cf0f3148 Add WebM to the Matroska demuxer name. 
Originally committed as revision 24639 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-01 00:30:37 +00:00
Aurelien Jacobs
f138fa78a3 100l: av_freep() needs the address of the pointer 
Originally committed as revision 24613 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-30 23:41:12 +00:00
Martin Storsjö
965a3ddb1f Remove mostly unnecessary rtpdec_*.h files, store the declarations in one file 
Originally committed as revision 24596 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-30 12:04:27 +00:00
Aurelien Jacobs
37287d41f4 avidec: demux ASS and SRT tracks out of GAB2 chunks 
Originally committed as revision 24579 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-29 22:17:30 +00:00
Aurelien Jacobs
ac066b83e9 add seeking support in ASS demuxer 
Originally committed as revision 24578 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-29 22:10:22 +00:00
Reimar Döffinger
8250561149 Check for udp_set_remote_url error. 
Fixes issue 1784 (hang with nonsense URL/no network available).

Originally committed as revision 24575 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-28 16:27:16 +00:00
Martin Storsjö
2845006608 rtsp: Move the definition of SDP_MAX_SIZE up, use it in the RTSP muxer, too 
Originally committed as revision 24571 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-28 09:26:15 +00:00
Baptiste Coudurier
f0187d20d1 In wav muxer, always flush in write_trailer, fix pipe output 
Originally committed as revision 24568 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-28 08:17:02 +00:00
Alexander Kojevnikov
ff58de29f1 Skip short padding in id3v2. 
Patch by Alexander Kojevnikov, alexander kojevnikov com

Originally committed as revision 24567 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-28 08:06:52 +00:00
Josh Allmann
42c63263d1 rtpdec_xiph: Handle the sampling SDP parameter 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24565 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-28 06:43:58 +00:00
Reimar Döffinger
f8a169ac8e Add extern to mxf_d10_muxer forward declaration to avoid a redundant 
redeclaration warning.

Originally committed as revision 24564 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-28 05:48:48 +00:00
Michael Niedermayer
a20df85886 Fix doxy that refers to the wrong variable. 
Originally committed as revision 24549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-27 15:54:26 +00:00
Michael Niedermayer
ec906fcdd7 Fix 2 doxy comments that referred to the wrong variable. 
Originally committed as revision 24547 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-27 15:21:29 +00:00
Michael Niedermayer
76c56376ca Make doxygen formatting more consistent. 
Originally committed as revision 24546 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-27 15:20:02 +00:00
Stefano Sabatini
88ad2faff8 Place the concat protocol entry at the begin of the registered 
protocol list, restore alphabetical order.

Originally committed as revision 24545 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-27 14:34:56 +00:00
Alex Converse
ac3ccbc0e2 Document existing rules for AVInputFormat.name. 
Originally committed as revision 24544 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-27 14:13:24 +00:00
Alexander Kojevnikov
2a758efe31 Make frames unsigned. 
Patch by Alexander Kojevnikov, alexander kojevnikov com

Originally committed as revision 24540 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-27 10:11:05 +00:00
Alexander Kojevnikov
49d7ef282d Show correct bitrate for VBR MP3 files. 
Patch by Alexander Kojevnikov, alexander kojevnikov com

Originally committed as revision 24539 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-27 10:08:34 +00:00
Måns Rullgård
8a0f61c4fb Remove duplicate initialiser for cavsvideo_muxer.extensions 
The extensions field was initialised first to "cavs", then to "avs".
The name "cavs" is kept since this is used for the format elsewhere
and "avs" is already used for avisynth files.

Originally committed as revision 24538 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-27 08:21:23 +00:00
Josh Allmann
adc03a3406 rtpdec_xiph: Drop RTP packets that come in without a prior fragment start marker. 
This can avoid segfaults in some cases.

Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 24537 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-27 08:16:03 +00:00
Måns Rullgård
4db40efa47 libavformat needs libavcore 
Originally committed as revision 24536 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-27 08:03:09 +00:00
Stefan Gehrer
de29597680 add Chinese AVS encoding via external library libxavs 
Originally committed as revision 24533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-27 07:18:36 +00:00
Stefano Sabatini
126b638ea0 Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate() 
in favor of the newly added corresponding functions
av_parse_video_size() and av_parse_video_rate() defined in
libavcore/parseutils.h.

This change also adds a linking-time dependency of libavcodec and of
libavfilter on libavcore.

Originally committed as revision 24518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-26 23:12:28 +00:00
Ronald S. Bultje
db9cc3a55a Reindent after r24516. 
Originally committed as revision 24517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-26 22:22:42 +00:00
Ronald S. Bultje
e87b7d72c6 Use inverse error branches, i.e. instead of if(something){success} else {error}, 
use if(!something) {return error;} success;, which needs less indenting.

Originally committed as revision 24516 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-26 22:22:20 +00:00
Ronald S. Bultje
540ab68c64 Use av_log(.., AV_LOG_ERROR) instead of dprintf() for logging errors. This 
should help in making mmst a little more userfriendly, or at least debuggable.
Also use helpful error return values instead of -1.

Originally committed as revision 24515 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-26 22:21:14 +00:00
Aurelien Jacobs
2701fd40f9 matroskaenc: add support for muxing SRT tracks 
Originally committed as revision 24503 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 21:16:58 +00:00
Aurelien Jacobs
7b53f463b4 add mime-type for ASS muxer 
Originally committed as revision 24502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 19:36:20 +00:00
Martin Storsjö
752ff3ffa7 Include the correct header that actually is used, use quotes instead of angle brackets 
Originally committed as revision 24501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 19:12:35 +00:00
Reimar Döffinger
853a0fccce Cosmetics: fix indentation and remove a useless else. 
Originally committed as revision 24495 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 14:35:12 +00:00
Reimar Döffinger
3aa13da970 Simplify get_byte and url_fgetc. 
Originally committed as revision 24494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 14:33:40 +00:00
Reimar Döffinger
e36a39066c Move ffm_close function up to avoid a forward declaration. 
Originally committed as revision 24491 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 07:54:33 +00:00
Reimar Döffinger
527b46ba26 ffmdec: Do not manually free streams on read_header error, this is always 
handled by upper layers.
Fixes double-frees (issue 2003).
Instead call ffm_close to ensure rc_eqs are freed also in the error case.

Originally committed as revision 24490 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 07:52:58 +00:00
Aurelien Jacobs
ba2c508d0c add SubRip muxer and demuxer 
Originally committed as revision 24488 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-24 22:50:12 +00:00
Reimar Döffinger
6f2c523c85 Fix a "function declaration isn't a prototype" warning. 
Originally committed as revision 24480 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-24 12:58:28 +00:00
Martin Storsjö
496c645d3b Never shrink the ByteIOContext buffer in ff_rewind_with_probe_data 
If there is little unread data in the ByteIOContext buffer, this may lead
to reducing the size of the ByteIOContext buffer to little more the probe
data size. This can lead to suboptimal aviobuf behaviour, e.g. making some
demuxers fail to do short seeks backwards (if the input isn't seekable).

Originally committed as revision 24478 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-24 09:04:44 +00:00
Martin Storsjö
8dd25c52cb mpegts: Warn if unable to seek back 
Originally committed as revision 24477 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-24 08:43:52 +00:00
Baptiste Coudurier
ef011e6d58 In mpegts muxer, fix rbsp trailing bits in AUD nal, fixes issue #2122 
Originally committed as revision 24449 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-23 00:27:17 +00:00
Aurelien Jacobs
8a810ccbba use return value of ff_get_line() 
Originally committed as revision 24402 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-21 21:41:46 +00:00
Aurelien Jacobs
b0335fd957 document ff_get_line() 
Originally committed as revision 24401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-21 21:40:50 +00:00
Aurelien Jacobs
a43416a540 improve ff_get_line to return line length 
Originally committed as revision 24400 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-21 21:40:10 +00:00
Aurelien Jacobs
7c89295145 move ff_get_line to aviobuf.c 
Originally committed as revision 24399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-21 21:39:01 +00:00
Aurelien Jacobs
80769fb73f rename get_line to ff_get_line 
Originally committed as revision 24398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-21 21:35:44 +00:00
Axel Holzinger
354b757300 Zero-initialize structs/arrays with {0} instead of {}, which isn't proper C99 
Patch by Axel Holzinger, aholzinger at gmx dot de

Originally committed as revision 24391 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-21 17:27:28 +00:00
Martin Storsjö
4f5340a0b1 Reindent, rewrap long comment lines to keep line length below 80 chars 
Originally committed as revision 24390 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-21 17:25:09 +00:00
Martin Storsjö
bcc4cb4681 rtpdec_asf: Handle RTSP-MS packet splitting 
Originally committed as revision 24389 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-21 17:17:35 +00:00
Thierry Foucu
591db22dff gxfenc: Fix ES name in the UMF media description, by using strlen instead of sizeof 
Patch by Thierry Foucu, tfoucu at gmail

Originally committed as revision 24379 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-21 07:46:02 +00:00
Zhentan Feng
e4a28be67b Allow the ASF header to be transferred split over multiple packets, as some 
servers happen to do. For this, we also move several header-size-related
variables to the MMSTContext.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-20 15:14:15 +00:00
Zhentan Feng
d6cc1123e3 Explicitely set the size of the "ff_asf_head1_guid" header chunk, this is 
part of the spec and causes problems otherwise.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24362 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-20 15:11:44 +00:00