Commit Graph

6905 Commits

Author SHA1 Message Date
Alex Converse
1ed87f800f Parse and repack the first frame of H.264 in ASF because SPS+PPS lives in its own packet.
Originally committed as revision 23333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-26 04:22:52 +00:00
Alex Converse
74a6df59e3 Add an AVSTREAM_PARSE_FULL_ONCE parsing mode to parse headers and combine packets once and only once.
Originally committed as revision 23332 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-26 04:20:32 +00:00
Aurelien Jacobs
37dd235658 matroskadec: avoid potential crash after r23169
Originally committed as revision 23330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-25 22:55:12 +00:00
Zhou Zongyi
aafb822ba5 We're using generic tag-to-ID functions, so specific codec_id assignments
are no longer necessary. Patch by Zhou Zongyi <zhouzy AT os pku edu cn>.

Originally committed as revision 23312 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-25 15:39:32 +00:00
Carl Eugen Hoyos
74c853b621 Samsung uses SIPP as FourCC for MPEG-4 ASP.
Originally committed as revision 23309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-25 10:35:50 +00:00
trueice@gmail.com
aae9a0931c 24l trocadero: RTMP reader forgot to shift high byte of timestamp to its
proper position

Patch by trueice (his gmail account is obvious)

Originally committed as revision 23305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-25 07:01:04 +00:00
Baptiste Coudurier
ce2a9bc3c8 In ogg muxer, use random serial number of each ogg streams
Originally committed as revision 23302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 23:37:33 +00:00
Zhentan Feng
a24039861d MMS-over-TCP protocol support. Patch by Zhentan Feng <spyfeng gmail com>.
Originally committed as revision 23301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 21:59:32 +00:00
Stefano Sabatini
781cf5fd41 Add missing codec id <-> codec tag entries:
CODEC_ID_RAWVIDEO <->  Y41B
CODEC_ID_RAWVIDEO <->  Y42B
CODEC_ID_RAWVIDEO <->  YUV9
CODEC_ID_RAWVIDEO <->  YVU9

These codec tags are listed in fourcc.org, and are already listed in
libavcodec/raw.c:ff_raw_pix_fmt_tags as AVI tags.

Originally committed as revision 23296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 20:35:01 +00:00
Reimar Döffinger
0e765181c4 Add -f framemd5 muxer similar to framecrc.
Originally committed as revision 23289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 17:49:26 +00:00
Jai Menon
9bbe9a0dc1 Display a more descriptive log message when probe buffer limit is
reached.

Originally committed as revision 23288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 16:42:16 +00:00
Janne Grunau
612dc0238a Skip pes payload during probing to avoid start code emulation.
Patch by Janne Grunau, janne-ffmpeg jannau net

Originally committed as revision 23286 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 12:32:13 +00:00
David Conrad
7bb83d8ddf matroskaenc: Write codec time base as default duration for video tracks.
This isn't exactly semantically equivalent, but the field has already been
long abused to mean this, and writing it helps in determining a decent cfr
time base when transcoding from a mkv where the video codec stores none (VP8).

Originally committed as revision 23284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 08:58:19 +00:00
Reimar Döffinger
f1a0518524 Enable AVFMT_GENERIC_INDEX for Ogg demuxer. This avoids the many
seeks needed for binary search when seeking to a previously seen
location.

Originally committed as revision 23279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 23:33:38 +00:00
David Conrad
8daed34e48 matroskadec: Revert adding the doctype to metadata; it has no meaning elsewhere
Originally committed as revision 23275 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 22:20:04 +00:00
Benjamin Larsson
50eae97057 Reduce the score for the aea demuxer probing function.
Originally committed as revision 23273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 22:01:27 +00:00
Benjamin Larsson
946da73682 Fix detection of some stereo atrac files by not comparing the
block size mode and info byte.

Originally committed as revision 23272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 21:56:54 +00:00
Baptiste Coudurier
2da6050cf2 oups, 100l, revert unrelated hunk from commit r23266
Originally committed as revision 23269 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 21:10:05 +00:00
Baptiste Coudurier
a4de2b6ecf write 3gp perf tag for artist metadata
Originally committed as revision 23268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 21:06:11 +00:00
Baptiste Coudurier
221ed48602 albm 3gp tag has optional track field not date
Originally committed as revision 23267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 21:04:39 +00:00
Baptiste Coudurier
ea4c4d7fe3 change author metadata to artist in mov de/muxer
Originally committed as revision 23266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 21:03:14 +00:00
Stefano Sabatini
49837b8d24 Make the nut decoder read the ff_nut_video_tags to detect codec id of
the input file.

This is required as Nut codec tags are not contained in
ff_codec_bmp_tags.

Originally committed as revision 23260 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 18:34:18 +00:00
Stefano Sabatini
2e01def0fe Define ff_nut_video_tags and make Nut muxer and demuxer set it in
codec_tag.

Originally committed as revision 23259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 18:34:15 +00:00
Reimar Döffinger
944a1b6b96 Add a md5 muxer that allows checking the md5 sums of generated streams without
needing an external MD5 command.

Originally committed as revision 23257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 13:07:33 +00:00
Martin Storsjö
576fb48e6d Make ff_random_get_seed public, rename to av_get_random_seed, export the header
Keep an old ff_ named function for binary compatibility until the
next major bump.

Originally committed as revision 23254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 08:53:40 +00:00
Stefano Sabatini
e1745e2f6e Make av_write_header() return AVERROR(EINVAL) rather than -1 if the
input parameters are not valid.

Originally committed as revision 23253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 21:52:06 +00:00
Stefano Sabatini
cf5b33d9fa Store in a dedicated array the format name - codec id - codec type
mapping. Simplify.

Originally committed as revision 23252 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 21:52:02 +00:00
Francesco Lavra
80b39e1ca6 Move AVCodecTag from riff.h into internal.h.
Patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 23250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 16:01:32 +00:00
Stefano Sabatini
83c2707908 Prefer enum CodecID over int in ff_codec_get_tag().
Originally committed as revision 23249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 15:56:49 +00:00
David Conrad
577abedb39 matroskaenc: Don't write track timecode scale
It's not required for mkv and unsupported in webm

Originally committed as revision 23247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 01:41:38 +00:00
David Conrad
c7b913c8ad matroskadec: Allow unknown EBML doctype
Originally committed as revision 23246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 01:41:35 +00:00
James Zern
470491faed matroskadec: Support webm doctype
Patch by James Zern <jzern at google>

Originally committed as revision 23245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 01:41:32 +00:00
Baptiste Coudurier
ff85f58605 remove unused field
Originally committed as revision 23232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-21 21:41:38 +00:00
Baptiste Coudurier
95ca3b1e20 In ogg muxer, pack multiple frames into one page, much lower overhead
Originally committed as revision 23231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-21 21:38:54 +00:00
Martin Storsjö
38d4a21778 Change the default codecs for the rtsp muxer to mpeg4 and aac
These codecs in RTP are supported by many players.

Originally committed as revision 23209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-21 07:12:33 +00:00
Martin Storsjö
648e41b342 Take ff_write_chained in use in the mov rtp hinter and in the rtsp muxer
Originally committed as revision 23208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-21 07:08:29 +00:00
Martin Storsjö
9a76125069 Add a libavformat internal function ff_write_chained
Originally committed as revision 23207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-21 07:07:57 +00:00
Michael Niedermayer
fbfccc0404 Disable non interleaved avi code when there is no index available.
Fixes issue1956.

Originally committed as revision 23202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-20 18:34:44 +00:00
Google
6c7c62939b Add VP80 fourcc
Patch by Google

Originally committed as revision 23193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-19 16:50:12 +00:00
Google
23966972ab matroska: Add V_VP8
Patch by Google

Originally committed as revision 23192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-19 16:50:06 +00:00
Martin Storsjö
8d168a9207 Fix a crash when opening WMS RTSP streams
Fixes issue 1948

Originally committed as revision 23181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-19 09:46:29 +00:00
Martin Storsjö
d4493e03b6 Late bump of the minor version, for the addition of AVFMT_FLAG_RTP_HINT
Originally committed as revision 23179 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-19 08:13:13 +00:00
David Conrad
5549aa6d0d matroskadec: Free ebml binary buffer on error
Based on a Chromium patch

Originally committed as revision 23169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 21:21:37 +00:00
David Conrad
465c28b6b4 matroskadec: Fix buffer overread in matroska_ebmlnum_uint
Based on a Chromium patch

Originally committed as revision 23168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 21:21:32 +00:00
David Conrad
d98bd80ed3 matroskadec: Ensure time_scale is nonzero, fixes divide-by-zero if the file
has 0 written

Based on a Chromium patch

Originally committed as revision 23167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 21:21:28 +00:00
David Conrad
1c664b239c matroskadec: Use av_freep in ebml_read_ascii
Based on a Chromium patch

Originally committed as revision 23166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 21:21:23 +00:00
Martin Storsjö
44bf251a42 Use a heuristic for describing the RTP packets using sample data
Originally committed as revision 23165 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 19:48:25 +00:00
Martin Storsjö
e977af6f2e Add initial support for RTP hinting in the mov muxer
Originally committed as revision 23164 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 19:47:24 +00:00
Martin Storsjö
27a826c941 Make mov_write_packet non-static, add ff_ prefix
Originally committed as revision 23163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 19:40:17 +00:00
Martin Storsjö
f72dad4142 Move the mov muxer structures to a separate header
Originally committed as revision 23162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 19:38:37 +00:00
Martin Storsjö
796ac2335d Add a flag for enabling RTP hinting
Originally committed as revision 23161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 19:34:21 +00:00
Martin Storsjö
0341b6994a Make ff_sdp_write_media a lavf-internal function
This is in preparation for RTP hinting in the MOV muxer, where
it needs to be able to create SDP fragments for each media stream.

Originally committed as revision 23160 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 19:32:59 +00:00
Francesco Lavra
698f4cc7f0 Validate AVCodecTag vs CodecID.
Patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 23159 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 19:23:29 +00:00
Francesco Lavra
603a5f04b2 Factorize some code into the new function ff_toupper4().
Patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 23158 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 19:16:40 +00:00
Janne Grunau
b74f67eb17 In ts demuxer, output pes packet as soon as they are complete.
This is needed for subtitles where packets are infrequent.
Patch by Janne Grunau, janne-ffmpeg at jannau dot net.

Originally committed as revision 23157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 17:28:07 +00:00
Baptiste Coudurier
1095d44258 set avg frame rate in mkv demuxer
Originally committed as revision 23152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-17 18:12:58 +00:00
Stefano Sabatini
73762de18e Add NV12 and NV21 AVI tags.
Both are listed in fourcc.org.

Originally committed as revision 23145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-16 07:56:31 +00:00
Baptiste Coudurier
58edb075f0 Change MAX_READ_SIZE message during av_find_stream_info to DEBUG level.
It is not harmful and it scares too many users.

Originally committed as revision 23139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-14 22:04:39 +00:00
Sebastian Vater
299ac811ba Reindent after r23112.
Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23113 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-13 15:41:49 +00:00
Sebastian Vater
65d213ec86 Move handling of paletted data to the IFF demuxer. This allows future
handling of things such as masking/EHB/HAM for this type of data.

Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-13 15:39:40 +00:00
Stefano Sabatini
7693b93e5c Doxygen av_codec_get_id() and av_codec_get_tag().
Originally committed as revision 23102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-12 22:17:29 +00:00
Francesco Lavra
f10d3d343e Add FourCC MJPG for CODEC_ID_JPEGLS.
Patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 23076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 23:19:19 +00:00
Stefano Sabatini
b43f432c8c Add support to the Y411 codec tag, corresponding to the rawvideo pixel
format uyyvyy411.

The codec tag is referenced in fourcc.org.

Originally committed as revision 23072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 22:56:04 +00:00
Stefano Sabatini
8e89cd1fee Make the nut demuxer issue a more meaningful error message if it
cannot recognize the provided codec tag.

Originally committed as revision 23071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 22:56:02 +00:00
Sebastian Vater
0613ece542 Replace usage of s->streams[0]->* with st->*, which is shorter.
Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 20:10:48 +00:00
Michael Niedermayer
cb0061d453 Favor chunk size over hitting the correct position after reading the chunk size in asf.
Fixes issue1923

Originally committed as revision 23040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-07 08:08:09 +00:00
Sebastian Vater
8af7dbce61 Parse IFF metadata.
Patch by Sebastian Vater, cdgs D basty A googlemail

Originally committed as revision 23024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 17:26:59 +00:00
David Conrad
ddb630177a movenc: Write QuickTime chapters
Originally committed as revision 23022 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 08:41:10 +00:00
David Conrad
1b206f62ea movenc: Swap positions of mov_write_header and mov_write_packet
Originally committed as revision 23021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 08:41:06 +00:00
David Conrad
1cf9f6ed4f mov: Read nero chapters
Originally committed as revision 23020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 08:41:01 +00:00
Thierry Foucu
e1954bb5ca Do not use pkt->size when it is potentially uninitialized.
Patch by Thierry Foucu, tfoucu gmail

Originally committed as revision 23017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-04 17:17:16 +00:00
Reimar Döffinger
c99d506b3b Fix off-by-one errors in description of score_max argument for
av_probe_input_format2

Originally committed as revision 23004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-01 15:36:51 +00:00
Reimar Döffinger
8e2ee182fa Export av_probe_input_format2.
Originally committed as revision 23002 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-01 13:49:35 +00:00
Michael Niedermayer
2308b6c19a Add version to AVClass so we can add to and use fields of AVClass without ABI issues.
Originally committed as revision 22987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-28 20:00:23 +00:00
Anssi Hannula
337104ac1f Fix FourCC when remuxing VP6F, regression introduced in r22941.
Patch by Anssi Hannula, anssi D hannula A iki fi

Originally committed as revision 22985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-28 07:57:07 +00:00
Sebastian Vater
4f5e6ef16e Reindent after rr22977.
Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-27 14:04:11 +00:00
Sebastian Vater
46dcabf82b Make the IFF demuxer a little more standards-compliant, e.g. respect the size
fields of common media header chunks (these can have different sizes depending
on the type of IFF file you read), better handle odd sizes (like RIFF, every
field is padded to word) and handle headerchunks after the BODY chunk.

Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-27 14:03:47 +00:00
Stefano Sabatini
ec6791736c Make file_open() return the error code set in errno if open() fails,
rather than always ENOENT.

Originally committed as revision 22972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-26 22:36:51 +00:00
Stefano Sabatini
2ef6c1242a Mark av_metadata_set() as deprecated, and use av_metadata_set2()
in its place.

av_metadata_set() is going to be dropped at the next major bump.

Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-25 14:27:42 +00:00
Baptiste Coudurier
0403c2e3e4 Disable LATM AAC in mpegts, this is not supported and produce too many
bug reports. Also warn the user about it.

Originally committed as revision 22947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-22 20:34:30 +00:00
Jai Menon
037e9afd37 Fix off-by-1 error in the tag parsing code.
Originally committed as revision 22945 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-22 12:54:50 +00:00
Tomas Härdin
951776c478 Made FLIC demuxer capable of handling the videos from "X-COM: Terror from the Deep".
Originally committed as revision 22942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-22 09:04:33 +00:00
Christian Schmidt
03cb8458ce Support VP6F in Matroska.
Patch by Christian Schmidt, schmidt digadd de

Originally committed as revision 22941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-22 08:57:28 +00:00
Stefano Sabatini
9d30e0682a Do not initialize res in url_fseek(), in the case !s->seek directly
return AVERROR(EPIPE) rather than the pre-defined value of res.

Slightly improve readability.

Originally committed as revision 22939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-21 21:19:25 +00:00
Vitor Sessak
10fa22ccfb Fix MTV decoding on big-endian systems
Originally committed as revision 22929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-21 13:00:48 +00:00
David Conrad
7221579b0c mov: Read QuickTime chapters
Originally committed as revision 22928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-21 06:36:09 +00:00
David Conrad
dc75e4e3b3 movenc: Write nero chapters
Originally committed as revision 22927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-21 06:36:05 +00:00
Baptiste Coudurier
f7501a71a1 seems aac gets screwed up by the parser so disable it
Originally committed as revision 22926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 21:23:49 +00:00
Baptiste Coudurier
dc1c26dc8e parse stream headers for audio streams in mkv, needed for frame size
Originally committed as revision 22925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 21:19:27 +00:00
Sebastian Vater
e595346486 Reindent / reformat some code with broken indenting.
Patch by Sebastian Vater <cdgs DOT basty googlemail com>.

Originally committed as revision 22924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 18:40:45 +00:00
Sebastian Vater
bf29cbc2cc Change a %2 to &1. Patch by Sebastian Vater <cdgs DOT basty googlemail com>.
Originally committed as revision 22922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 17:05:02 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands.
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +00:00
Diego Biurrun
e1ae1642cb Add missing internal.h #include for brktimegm(), fixes the warning:
libavformat/dvenc.c:82: warning: implicit declaration of function ‘brktimegm’

Originally committed as revision 22920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:41:55 +00:00
Martin Storsjö
5948f82227 Reset RTCP timestamps after seeking, add range start offset to the packets timestamps
If these aren't reset, the timestamps make a huge jump when the next RTCP
is received.

Originally committed as revision 22918 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 07:38:52 +00:00
Martin Storsjö
2cab6b48ad Revert svn rev 21857, readd first_rtcp_ntp_time in RTPDemuxContext
In order to sync RTP streams that get their initial RTCP timestamp at
different times, propagate the NTP timestamp of the first RTCP packet
to all other streams.

This makes the timestamps of returned packets start at (near) zero instead
of at any random offset.

Originally committed as revision 22917 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 07:34:28 +00:00
Baptiste Coudurier
2293a2e67f Set AVFMT_NOTIMESTAMPS flag for mp3 muxer
Fixes issue 1026

Originally committed as revision 22916 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 01:41:00 +00:00
Luca Barbato
9094d867aa Make rtp protocol obey rfc3550
Originally committed as revision 22906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-19 11:40:45 +00:00
Howard Chu
fc8fa007fb Implement librtmp seek support.
Implement flv_read_seek(), add a missing check on stream_index
and fix timestamp rounding in rtmp_read_seek().

Also add the flv_read_seek2() function, which is not enabled but is
useful as reference.
To actually implement flv_read_seek2() correctly, there would need to
be some corresponding av_url_read_fseek2() function to propagate the
timestamps down to the ByteIOContext and URLContext.

Patch by Howard Chu <hyc <at> highlandsun.com>.

See the thread:
Subject: [FFmpeg-devel] RTMP seek support
Date: 2010-03-28 23:35:02 GMT

Originally committed as revision 22904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-18 19:09:25 +00:00
Stefano Sabatini
d79fc8403b Prefer AVERROR(ENOSYS) over AVERROR_NOTSUPP.
AVERROR_NOTSUPP is (maybe) going to be deprecated.

Originally committed as revision 22903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-18 19:09:22 +00:00
Stefano Sabatini
4c4ef3db4b Make url_fsize() return AVERROR(ENOSYS) rather than AVERROR(EPIPE) if
the seek operation is not defined in the ByteIOContext.

Originally committed as revision 22902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-18 17:37:21 +00:00
Stefano Sabatini
28894105c8 Make url_seek() return AVERROR(ENOSYS) rather than AVERROR(EPIPE) in
the case where the seek operation is not defined in the protocol
handler.

Originally committed as revision 22901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-18 17:37:16 +00:00
Martin Storsjö
653d7aeb61 Parse strf mov atoms
This fixes roundup issue 1270.

Originally committed as revision 22894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-16 20:36:24 +00:00
David Conrad
adc725b558 oggdec: Move warning about missing granule to the correct place
Originally committed as revision 22891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-16 12:21:38 +00:00
David Conrad
44a088eab7 oggdec: Fix duration calculation if the last page in a file has no granule
Originally committed as revision 22890 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-16 12:21:35 +00:00
David Conrad
49c2d29089 oggdec: Remove write-only variable
Originally committed as revision 22889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-16 12:21:29 +00:00
Ramiro Polla
adef229efb AVERROR(FF_NETERROR(x)) -> FF_NETERROR(x)
FF_NETERROR is implicitly an AVERROR.

Originally committed as revision 22888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-16 00:20:11 +00:00
Ronald S. Bultje
4aecee7fc3 Fix compile error on mingw where ETIMEDOUT is missing (because it's a WSA error).
This patch also changes FF_NETERROR() to be an AVERROR(), i.e. it is always
negative, whereas it was previously positive.

Originally committed as revision 22887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-15 18:27:27 +00:00
Ronald S. Bultje
e58c05bb3c Remove useless assert(), since this can (in theora) be used for any Xiph
codec, so there's no reason to (invalidly) limit it to only Theora.

Also fixes issue 1880 (compilation error on -DDEBUG).

Originally committed as revision 22886 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-15 13:30:12 +00:00
Howard Chu
19c9eedc2c Plug librtmp logging into av_log.
patch by Howard Chu, hyc highlandsun com

Originally committed as revision 22875 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-13 22:11:21 +00:00
Diego Biurrun
fc122efd66 whitespace cosmetics
Originally committed as revision 22874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-13 22:08:36 +00:00
Jean-Daniel Dupas
2898526d6a Do not probe when the format is known.
Patch by Jean-Daniel Dupas devlists shadowlab org

Originally committed as revision 22870 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-13 07:25:50 +00:00
Vitor Sessak
efd8b009ff Use a suitable timebase in VQF demuxer
Originally committed as revision 22868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-13 01:19:59 +00:00
Howard Chu
c007c687c9 Do not set pos to an error value.
Patch by Howard Chu, hyc highlandsun com

Originally committed as revision 22853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-12 15:03:30 +00:00
Tomas Härdin
6b174197b5 Predicting the size of the hdlr, string data and trkn tags in the MOV muxer
Originally committed as revision 22846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-12 07:24:30 +00:00
Stefano Sabatini
9a2cb05ff9 Move the internal function declarations in avformat.h to internal.h.
Originally committed as revision 22843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-11 21:44:23 +00:00
Howard Chu
7e939205d9 Set audio bit rate.
Patch by Howard Chu, hyc highlandsun com

Originally committed as revision 22835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-11 12:21:30 +00:00
Michael Niedermayer
0f1f4816d5 Raise needed score for codec probing in CODEC_ID_PROBE before the last packet.
Fixes issue1871

Originally committed as revision 22831 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-11 00:43:36 +00:00
Michael Niedermayer
497431a5b6 Dont try to compute AVPacket duration for possibly interlaced video codecs
when no parser is available.
This partly fixes the frame rate misdetection in issue1756.

Originally committed as revision 22824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-09 22:39:39 +00:00
Tomas Härdin
7a6fe01f99 Seeking forward in non-seekable media by discarding data, regardless of how far to seek. Won't SEEK_END unless forced though.
Originally committed as revision 22822 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-08 09:47:32 +00:00
Tomas Härdin
01d91b9be9 Reusing the probe buffer to rewind the ByteIOContext in ff_probe_input_buffer() instead of seeking back to the start of the file. Once exhausted, the size of the buffer is reduced.
Originally committed as revision 22821 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-08 09:02:27 +00:00
Joakim Plate
c6cf6ae69d Don't write an empty spdif header in spdif muxers write_header function before actual data starts.
Patch by Elupus.

Originally committed as revision 22814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-07 19:40:46 +00:00
Ronald S. Bultje
56a8242fdd Actually add flag (somehow got lost in my previous patchset?), fixes broken
r22806.

Originally committed as revision 22807 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-05 19:50:45 +00:00
Anton Khirnov
3dd6180fc7 Add a flag to not overwrite existing tags
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-05 19:46:55 +00:00
Martin Storsjö
0950e1703b Reindent
Originally committed as revision 22805 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-05 17:26:06 +00:00
Martin Storsjö
0e4b185a8d Fix leaks in the AAC RTP depacketizer
Originally committed as revision 22804 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-05 17:25:39 +00:00
Ronald S. Bultje
1da1e1933f Add void to a function prototype that takes no arguments. Fixes a potential
compiler warning.

Originally committed as revision 22803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-05 16:13:51 +00:00
Michael Niedermayer
0e1f78f90b Fix rounding direction for calculation of AVPacket.duration.
Fixes issue1579

Originally committed as revision 22802 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-04 22:19:42 +00:00
Martin Storsjö
3370289a4c Zero-initialize the reply struct
The status_code field is read in the fail codepath, where it could be
read uninitialized earlier. Found by clang.

Originally committed as revision 22801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-04 21:59:06 +00:00
Stefano Sabatini
5b33a55376 Implement support to the AVSEEK_SIZE operation in file_seek().
Avoid the need to use seeking for getting the file size, use fstat
instead, which is significantly faster.

See thread:
Subject: [FFmpeg-devel] [PATCH] Add support to AVSEEK_SIZE to the file protocol seek callback
Date: Fri, 2 Apr 2010 13:13:27 +0200

Originally committed as revision 22799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-04 14:21:29 +00:00
Michael Niedermayer
37f57ab4dd Allow AVFormatContext.duration to be set if no individual stream duration is known.
Demuxers already do this ...

Originally committed as revision 22796 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-04 12:20:10 +00:00
Stefano Sabatini
2874c81cc8 Replace all remaining occurrences of AVERROR_NOMEM with
AVERROR(ENOMEM).

AVERROR_NOMEM is deprecated and will be dropped at the next libavutil
major bump.

Originally committed as revision 22791 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-03 14:15:00 +00:00
Martin Storsjö
0e64218889 Remove a redundant assignment, found by clang
Originally committed as revision 22790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-03 12:16:33 +00:00
Ronald S. Bultje
ff273ddae7 Fix buffer size; should hold 2 32-bit integers in hex = 16 chars + terminating
zero, so should be 17 bytes, not 9.

Originally committed as revision 22786 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02 22:08:57 +00:00
Sam Gerstein
f3c68c5b45 ETIME -> ETIMEDOUT. Patch by Sam Gerstein <sgerstein bluefinlab com>.
Originally committed as revision 22785 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02 20:14:55 +00:00
Ronald S. Bultje
7b374c9ff2 Another uninitialized value.
See http://tranquillity.ath.cx/clang/2010-03-30-1/report-e6KUTb.html#EndPath

Originally committed as revision 22783 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02 14:58:55 +00:00
Ronald S. Bultje
190413cf81 Fix uninitialized value in codepath.
See http://tranquillity.ath.cx/clang/2010-03-30-1/report-40QvF3.html#EndPath

Originally committed as revision 22782 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02 14:58:03 +00:00
Ronald S. Bultje
ddf8e75ede Remove dead initialization.
Originally committed as revision 22781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02 14:56:59 +00:00
Ronald S. Bultje
0b9535b9a2 Remove dead initialization.
Originally committed as revision 22780 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02 14:55:01 +00:00
Martin Storsjö
4bebf2cf64 Change a case of CODEC_TYPE_ into AVMEDIA_TYPE_
This was accidentally overwritten in the recent merge of the theora/vorbis codepaths

Originally committed as revision 22774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02 11:33:02 +00:00
Josh Allmann
339f5f3957 Merge Vorbis / Theora depayloaders.
Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>.

Originally committed as revision 22768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 21:43:22 +00:00
Josh Allmann
cb92a9c038 Reindent after r22766.
Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>.

Originally committed as revision 22767 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 21:42:10 +00:00
Josh Allmann
96070b8b5c Rename functions / comments from "Theora" to "Xiph" where relevant.
Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>.

Originally committed as revision 22766 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 21:41:48 +00:00
Josh Allmann
06a36faf4c Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for merging
the Vorbis / theora depacketizers.

Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>.

Originally committed as revision 22765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 21:40:56 +00:00
Michael Niedermayer
ccf8c2944c Limit probing to probesize.
Originally committed as revision 22758 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 12:09:33 +00:00
Howard Chu
527c2e6429 Fix flvdec start-of-frame.
Patch by Howard Chu hyc highlandsun com

Originally committed as revision 22757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 08:02:20 +00:00
Stefano Sabatini
1a70d12727 Make av_match_ext() declaration public (move its declaration out of
the #ifdef HAVE_AV_CONFIG_H block in avformat.h).

Originally committed as revision 22748 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 19:03:03 +00:00
Michael Niedermayer
fe8344a276 Add AVFMT_FLAG_NOFILLIN and AVFMT_FLAG_NOPARSE.
Originally committed as revision 22745 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 12:55:16 +00:00
Jean-Daniel Dupas
cc947f04cc Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 12:29:58 +00:00
Joakim Plate
46da7fa133 Probe aac codecs for CODEC_ID_PROBE.
Patch by Joakim Plate, elupus ecce se

Originally committed as revision 22742 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 10:45:15 +00:00
Anton Khirnov
8166c498df Remove superfluous space from a conversion table.
Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 22741 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 09:22:31 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
Benoit Fouet
32e543f866 Replace @returns by @return.
Originally committed as revision 22729 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 15:50:57 +00:00
Stefano Sabatini
8a36b59ba6 Document url_exist().
Originally committed as revision 22725 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 22:29:14 +00:00
Mohamed Naufal
148bcae98c Implement YOP demuxer and video decoder.
Patch by Mohamed Naufal gmailify(naufal11).

Originally committed as revision 22724 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 22:17:01 +00:00
Reimar Döffinger
c2bfd81605 Some spelling fixes.
Originally committed as revision 22720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 19:17:49 +00:00
Sam Gerstein
9cba6f5f40 Add a timeout to the select() call. Patch by Sam Gerstein <sgerstein bluefinlab
com>.

Originally committed as revision 22718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-29 17:36:08 +00:00
Howard Chu
0f943ce663 Implement support to RTMP, RTMPT, RTMPE, RTMPTE, RTMPS protocols via
librtmp.

Patch by Howard Chu <hyc * highlandsun * com>.

Originally committed as revision 22710 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-28 13:39:36 +00:00
Stefano Sabatini
9bee245954 Document url_seek().
Originally committed as revision 22709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-28 10:31:22 +00:00
Vitor Sessak
f990f6e3f7 Fix NUT (de)muxer warnings:
CC    libavformat/nutdec.o
libavformat/nutdec.c: In function ‘read_seek’:
libavformat/nutdec.c:862: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
libavformat/nutdec.c:871: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
libavformat/nutdec.c:879: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’
CC    libavformat/nutenc.o
libavformat/nutenc.c: In function ‘write_packet’:
libavformat/nutenc.c:680: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’

Originally committed as revision 22707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-28 09:59:58 +00:00
Martin Storsjö
4c1202f76e Initialize ssrc and base_timestamp using ff_random_get_seed()
Originally committed as revision 22706 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-28 08:48:45 +00:00
Aurelien Jacobs
9b1db5ec99 correct first pts for ogg skeleton
Originally committed as revision 22705 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-28 01:15:08 +00:00
Stefano Sabatini
66b6c7458e Document the behavior of av_metadata_get() if the prev parameter is
NULL.

Originally committed as revision 22704 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-27 21:14:16 +00:00
Reimar Döffinger
d14f5391c1 Use more appropriate return values in txd demuxer.
Originally committed as revision 22703 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-27 19:10:24 +00:00
Reimar Döffinger
36031c2033 eacdata: fix a memleak, return partial packets and use proper return values.
Originally committed as revision 22702 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-27 19:09:46 +00:00
Martin Storsjö
cae9a15c98 Don't report EINTR from select as an error, retry select instead
Originally committed as revision 22694 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-26 16:04:38 +00:00
Micah F. Galizia
532aa889eb Fix updating condition for the probe_size variable in the internal
loop of ff_probe_input_buffer(), making sure that probe_size is always
set to probe_max_size in the last iteration.

Also make the function return an error if we get to the max probe
length and still cannot figure out what the format is.

Patch by Micah Galizia micahgalizia A gmail D com.

Originally committed as revision 22688 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-26 01:12:14 +00:00
Martin Storsjö
4bc5cc2313 Reassemble the RTSP URL before replacing hostname with the numerical IP
Originally committed as revision 22681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 22:21:09 +00:00
Martin Storsjö
7b4a36450b Simplify ff_rtsp_send_cmd_with_content_async, remove an unnecessary buffer
Originally committed as revision 22680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 22:04:41 +00:00
Martin Storsjö
60f198a774 Remove a redundant null pointer check
Originally committed as revision 22679 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 21:53:42 +00:00
Martin Storsjö
30af077942 Don't force basic auth in RTSP, but retry with the server-specified method on failure
Originally committed as revision 22678 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 21:49:43 +00:00
Martin Storsjö
2626308abb Actually parse the auth headers in RTSP
Originally committed as revision 22677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 21:48:58 +00:00
Martin Storsjö
aa8bf2fb80 Make RTSP use the generic http authentication code
Still hardcoded to use Basic auth, without parsing the reply headers

Originally committed as revision 22676 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 21:47:33 +00:00
Martin Storsjö
b17d11c632 Add separate method/url parameters to the rtsp_send_cmd functions
Originally committed as revision 22675 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 21:46:14 +00:00
Martin Storsjö
e9fea405a7 Reindent
Originally committed as revision 22672 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 19:47:26 +00:00
Jai Menon
4896dd57fa Matroska muxer : Don't create audio tracks for unsupported audio codecs.
Originally committed as revision 22669 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 14:34:19 +00:00
Martin Storsjö
855e7732c6 Add support for http digest authentication
Originally committed as revision 22667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 13:58:26 +00:00
Martin Storsjö
d8f9295753 Reindent
Originally committed as revision 22666 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 07:14:41 +00:00
Martin Storsjö
ddbeb95447 Add a lowercase parameter to ff_data_to_hex
Originally committed as revision 22665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 07:13:20 +00:00
Martin Storsjö
b1cc5540e7 Make ff_rtsp_send_cmd simply call ff_rtsp_send_cmd_with_content
Originally committed as revision 22663 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-24 23:06:58 +00:00
Vitor Sessak
3bfb30b9e3 Fix warnings in NUT demuxer:
libavformat/nutdec.c: In function ‘read_seek’:
libavformat/nutdec.c:862: warning: passing argument 4 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘void **’ but argument is of type ‘struct Syncpoint **’
libavformat/nutdec.c:871: warning: passing argument 4 of ‘av_tree_find’ from incompatible pointer type
./libavutil/tree.h:44: note: expected ‘void **’ but argument is of type ‘struct Syncpoint **’

Originally committed as revision 22662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-24 22:44:06 +00:00
Luca Barbato
7ed8211b3e Issue a warning if the received CSeq isn't the expected one
Originally committed as revision 22661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-24 22:38:48 +00:00
Martin Storsjö
9405f733d9 Split out http authentication handling into a separate file
This prepares for adding support for more authentication methods

Originally committed as revision 22660 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-24 22:32:05 +00:00
Vitor Sessak
59856b9891 Fix warning:
libavformat/nut.c: In function ‘ff_nut_free_sp’:
libavformat/nut.c:80: warning: passing argument 4 of ‘av_tree_enumerate’ from incompatible pointer type
./libavutil/tree.h:92: note: expected ‘int (*)(void *, void *)’ but argument is of type ‘void (*)(void *, void *)’

Originally committed as revision 22659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-24 19:58:12 +00:00
Martin Storsjö
3032276b18 Handle errors returned from ff_rtsp_read_reply in udp_read_packet properly
Originally committed as revision 22657 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-24 18:52:27 +00:00
Zhentan Feng
852e0ca555 Move put_le16_nolen() to asf.c and give it a ff_ prefix. This way, it is easier
to share it with e.g. MMS.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 22656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-24 18:40:43 +00:00
Carl Eugen Hoyos
d692850bbb Silence ridiculous gcc warning.
Originally committed as revision 22654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-24 11:11:25 +00:00
Tomas Härdin
c6a5e087cf Mask away AVSEEK_FORCE properly in some checks in url_fseek()
Patch by Tomas Härdin $(name).$(s/ä/a/ $(surname)) AT codemill DOT se

Originally committed as revision 22653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-24 10:41:58 +00:00
Justin Ruggles
06ebe9161e Put ff_flac_write_header() in a separate C file to allow it to be shared without
duplicating code or adding a dependency on vorbiscomment.o.

Originally committed as revision 22652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-23 23:58:45 +00:00
Tomas Härdin
d40a999a1c Fix seeking in DV when filesize is unknown.
Patch by Tomas Härdin, tomas D hardin A  codemill D se

Originally committed as revision 22645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-23 17:22:25 +00:00
Martin Storsjö
7a033e08ea Handle multiple RTSP transport options properly by adding all of them into the mask
Originally committed as revision 22644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-23 08:00:37 +00:00
Martin Storsjö
602eb77975 Parse options in the RTSP URL only from the last question mark onwards
This helps if the URL (erroneously?) contains question marks within the path.

Originally committed as revision 22643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-23 07:59:23 +00:00
Martin Storsjö
2a21adf924 Reconstruct the RTSP URL, in order to remove the auth part from the URL sent to the server
Don't modify the user-specified s->filename at all, keep all modifications
locally and in rt->control_uri.

Originally committed as revision 22642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-23 07:55:15 +00:00
Justin Ruggles
19de452a63 Move ff_flac_write_header() to flacenc.h, which removes the Matroska muxer's
dependency on flacenc.o and fixes the unnecessary dependency on vorbiscomment.o.

Originally committed as revision 22639 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-22 21:58:38 +00:00
Michael Niedermayer
c51131290c Dont senselessly fail on rawvideo that isnt 3 files per frame.
Originally committed as revision 22637 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-22 20:18:42 +00:00
Josh Allmann
887af2aa12 RTP depacketization of Theora
Patch by Josh Allmann (joshua allmann gmail com)

Originally committed as revision 22636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-22 16:26:29 +00:00
Martin Storsjö
685e76b554 Reindent
Originally committed as revision 22635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-22 15:07:36 +00:00
Martin Storsjö
b7dc88fc68 Add support for TCP as lower transport in the RTSP muxer
Originally committed as revision 22634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-22 15:07:05 +00:00
Martin Storsjö
9dff2308ba Interpret valueless attributes in AMR ftmp lines as being 1
Originally committed as revision 22631 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-22 14:44:28 +00:00
Martin Storsjö
6e69f6c47f Use the caller's RTSPMessageHeader in rtsp_setup_input_streams
Currently, the caller doesn't get the status_code and location for rediects,
since rtsp_setup_input_streams uses a copy of RTSPMessageHeader of its own.

Originally committed as revision 22630 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-22 14:42:52 +00:00
James Darnley
bb45237e11 Fix FLAC demuxer dependencies.
Patch by James Darnley <james darnley at gmail>

Originally committed as revision 22627 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-21 18:06:56 +00:00
Stefano Sabatini
2928b83c75 Make av_open_input_file() return AVERROR_INVALIDDATA rather than
AVERROR_NOFMT if the format is unknown / cannot be recognized.

It is returned AVERROR_INVALIDDATA, in the sense that the data is
invalid within what the specific libav* binary supports.

That was the last remaining use of AVERROR_NOFMT, which is going to be
dropped at the next libavutil major bump.

Originally committed as revision 22625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-21 16:34:04 +00:00
Justin Ruggles
59b4b54014 Add Changelog entry and bump lavf micro version for the addition of
VorbisComment writing for FLAC, Ogg/FLAC, and Ogg/Speex files.

Originally committed as revision 22607 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-20 13:42:49 +00:00
James Darnley
aeef3ec6f0 Add VorbisComment writing to Ogg/FLAC and Ogg/Speex files.
Patch by James Darnley <james darnley at gmail>

Originally committed as revision 22606 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-20 13:39:22 +00:00
James Darnley
66061a1220 Add VorbisComment writing to FLAC files.
Patch by James Darnley <james darnley at gmail>.

Originally committed as revision 22605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-20 13:36:43 +00:00
Stefano Sabatini
8d5e638f04 Make url_fseek() return AVERROR_EOF rather than AVERROR(EPIPE) if end
of file is reached.

Originally committed as revision 22590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-18 00:22:58 +00:00
Ronald S. Bultje
a7a85dc4c2 Cast sample_fmt (as read from bitstream as a 16-bit value) to int16, so that
negative values, e.g. SAMPLE_FMT_NONE (-1), are read correctly also.

Originally committed as revision 22585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-17 15:14:18 +00:00
Måns Rullgård
c7f625eecf Fix erroneous behaviour when format probe hits end of file
If the format probe hits end of file, do not add the error code
to the buffer position.  This is obviously wrong, and with a
small input file would cause a negative buffer overflow.

Fixes issue 1818.

Originally committed as revision 22571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-16 21:45:30 +00:00
Aurelien Jacobs
972ffe6220 rename av_read_frame_flush to ff_read_frame_flush
it is an internal function, not part of public API

Originally committed as revision 22562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 23:15:24 +00:00
Aurelien Jacobs
588af13fee rename av_program_add_stream_index to ff_program_add_stream_index
it is an internal function, not part of public API

Originally committed as revision 22561 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 23:14:07 +00:00
Greg Maxwell
fbe8c56dfe Correctly write last 0 lacing value when packet size is multiple of 255, patch by Greg Maxwell, gmaxwell at gmail dot com
Originally committed as revision 22559 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 23:04:09 +00:00
Michael Niedermayer
493f54ada0 Add AVSEEK_FORCE flag to indicate that the code should attempt to seek
by any means.

Originally committed as revision 22557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 22:54:22 +00:00
Aurelien Jacobs
6dfa52c8bd matroskadec: fix missing dependency
Originally committed as revision 22555 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 22:37:14 +00:00
Jai Menon
f75ab7a645 cosmetics : Print newline after error message.
Originally committed as revision 22551 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 19:03:48 +00:00
Martin Storsjö
db128802c5 Reindent
Originally committed as revision 22549 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 16:36:54 +00:00
Martin Storsjö
ad2ae6dbaf Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet.
Skip interleaved packets manually and recheck if there's more to be read.

Originally committed as revision 22548 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 16:36:20 +00:00
Martin Storsjö
ec55edba31 Make rtsp_skip_packet non-static, add ff prefix
Originally committed as revision 22547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 16:31:15 +00:00
Martin Storsjö
c040badb70 Reindent
Originally committed as revision 22546 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 16:15:51 +00:00
Martin Storsjö
c07c6f8183 RTSP: Synchronize the start time of the chained RTP muxers
This makes sure that the streams get correctly synchronized when viewed,
previously the streams were out of sync by as much time as it took
between the initialization of the individual muxers.

Originally committed as revision 22545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 14:20:07 +00:00
Martin Storsjö
b1d55e5e4f Use AVFormatContext.start_time_realtime in the RTP muxer
Originally committed as revision 22543 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 10:37:12 +00:00
Martin Storsjö
2dad0dcec6 Move the NTP offset definitions to internal.h
Originally committed as revision 22542 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 10:36:30 +00:00
Martin Storsjö
b8819c85b5 Add a new field AVFormatContext.start_time_realtime
Currently intended to be used by the RTP muxer

Originally committed as revision 22540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 10:29:37 +00:00
Anton Khirnov
63100f5885 riff: don't pad extradata when writing ASF.
Patch by Anton Khirnov mirror(moc liamg saksyw)

Originally committed as revision 22539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 08:49:02 +00:00
Aurelien Jacobs
e536ccd653 matroskadec: use more appropriate error code
Originally committed as revision 22535 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 00:19:22 +00:00
Aurelien Jacobs
e4a9e3cc7c move ff_url_split() and ff_url_join() declarations to internal.h
those functions are not part of the public API

Originally committed as revision 22534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 23:59:48 +00:00
Micah F. Galizia
eadd495d06 Move the probe loop from av_open_input_file() into its own method
av_probe_input_buffer() so that it can be reused. Here are a few
differences to the original way things were probed:

- maximum probe buffer size can be specified as a parameter.

- offset within the stream to probe from can be specified as a parameter.

- instead of seeking back to the start each time a probe fails, stream
  data is appended to the reallocated buffer. This lowers the amount
  of data read from the stream (there is no repetition) and results in
  fewer closed and reopened streams (when seeking fails).

New attempt after r22296, which was revert in r22315 due to a FATE
failure.

See the thread:
Subject: [FFmpeg-devel] [PATCH] Move av_open_input_file probe loop to its own method
Date: 2010-03-05 03:23:57 GMT

Patch by Micah F. Galizia printf("%s%s@%s.%s", "micah", "galizia", "gmail", "com").

Originally committed as revision 22532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 22:40:16 +00:00
Reimar Döffinger
28eb577390 Avoid creating tiny (possibly only 64 bytes large) audio packets resulting in
huge processing and memory usage overhead for avi files with raw PCM audio.

Originally committed as revision 22521 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 13:38:00 +00:00
Stefano Sabatini
5ae092ee34 Replace all the occurrences of AVERROR_EIO with AVERROR(EIO), and mark
AVERROR_EIO for deletion at the next major bump.

Originally committed as revision 22513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-13 19:19:44 +00:00
David Conrad
3477897e5a oggdec: Set packet duration for ogm streams
Originally committed as revision 22493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-13 05:55:57 +00:00
Aurelien Jacobs
6b10228a55 matroskadec: add support for SIPR audio tracks
Originally committed as revision 22492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 23:49:06 +00:00
Aurelien Jacobs
1ab0406db1 export rm_reorder_sipr_data() for future use by matroska demuxer
Originally committed as revision 22491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 23:35:59 +00:00
Aurelien Jacobs
adae9fa65e export sipr_subpk_size for future use by matroska demuxer
Originally committed as revision 22490 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 23:34:30 +00:00
David Conrad
81b743eb10 oggdec: Pass packets to header() until the stream is done with them
This fixes some old ogm files that had the 3rd vorbis header after a data
packet in another stream. This is invalid in ogg, but this change shouldn't
affect the behaviour of any valid file.

Originally committed as revision 22478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 05:17:01 +00:00
David Conrad
8730fad595 oggdec: Parse ogm chapters
Originally committed as revision 22477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 05:16:57 +00:00
David Conrad
2e5085854c oggdec: Cosmetics
Originally committed as revision 22476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 05:16:54 +00:00
David Conrad
d8ba748359 oggdec: Read ogm metadata
Originally committed as revision 22475 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 05:16:51 +00:00
David Conrad
533c30fced Const correctness for vorbis_comment
Originally committed as revision 22474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 05:16:47 +00:00
David Conrad
b53cde48bd oggdec: Metadata is per-stream; don't merge multiple streams' together
Originally committed as revision 22473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 05:16:44 +00:00
David Conrad
e4d2d8c5d7 Add ff_ prefix to vorbis_comment
Originally committed as revision 22472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 05:16:39 +00:00
Martin Storsjö
34056cbba5 Fix a crash in the H.263 RTP packetizer
If size == 1 and buf[0] == 0 and buf[1] == 0 (the first byte after the
buffer), it would set size = -1 and crash in the later memcpy.

Originally committed as revision 22469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 16:26:14 +00:00
Peter Ross
70b462cc29 Prevent memory leak introduced in r22389 in Bink demuxer: pass partial packets to decoder.
Originally committed as revision 22468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 12:29:02 +00:00
Martin Storsjö
5c7fd91010 Cosmetics, break a long line, fix brace placement
Originally committed as revision 22465 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 08:33:04 +00:00
Martin Storsjö
26cb700c82 RTSP muxer: Create the SDP with the numerical IP of the peer
instead of using the original host name

Originally committed as revision 22464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 08:24:18 +00:00
David Conrad
d8b91fae1d oggdec: Seek to keyframes
Originally committed as revision 22463 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:18:00 +00:00
David Conrad
873d117e4b oggdec: Determine pts and filepos on a packet basis in read_timestamp
This takes into account whether the granule defines the start or end times
of packets, and sets the correct file offset of the associated page.

Originally committed as revision 22462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:56 +00:00
David Conrad
6abaa27211 oggdec: Move PTS/DTS calculation to a function
Originally committed as revision 22461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:53 +00:00
David Conrad
2ac41150c0 oggdec: Fix memory leak in setting up vorbis headers
Originally committed as revision 22460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:49 +00:00
David Conrad
8f8320d7c3 oggdec: Don't use ogg_stream's seq for vorbis or speex headers
Originally committed as revision 22459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:46 +00:00
David Conrad
77560b0ef1 oggdec: Fix duration calculation for streams with non-zero start
Originally committed as revision 22458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:43 +00:00
David Conrad
32ad869284 oggdec: Parse skeleton to determine the start time of each stream
Originally committed as revision 22457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:40 +00:00
David Conrad
296bdf9cf1 oggdec: Check that we have a codec in gptopts (needed for skeleton)
Originally committed as revision 22456 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:36 +00:00
David Conrad
dfaed51f04 oggdec: Move ogg_find_stream and ogg_gptopts to oggdec.h
(skeleton will need them)

Originally committed as revision 22455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:33 +00:00
David Conrad
50a9d32310 oggdec: Set data_offset to the right value
Otherwise it gets set automatically to a page midstream and prevents seeking
to the first page.

Originally committed as revision 22454 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:29 +00:00
David Conrad
73823cb941 oggdec: Save offset of the page needed to reconstruct the current packet
Originally committed as revision 22453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:24 +00:00
Martin Storsjö
594a9aebbe Make the ntp_time function available to other parts of libavformat, as ff_ntp_time
Originally committed as revision 22438 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 22:21:39 +00:00
Benoit Fouet
114a93c700 Fix ffm_close return type.
Originally committed as revision 22432 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 14:26:15 +00:00
Vitor Sessak
2dc22a64b4 Fix memory leak in FFM demuxer
Originally committed as revision 22431 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 13:17:50 +00:00
Baptiste Coudurier
83c2bc7abb In mpegts muxer, free adts context and temporary data
Originally committed as revision 22428 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 09:20:32 +00:00
Baptiste Coudurier
e3433702ae reindent
Originally committed as revision 22427 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 09:19:14 +00:00
Dave Yeo
cbfa66d0cf Include os_support.h which has a fallback declaration of socklen_t
This fixes compilation on some OSes

Patch by Dave Yeo, daveryeo at telus dot net

Originally committed as revision 22426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 07:44:51 +00:00
Dave Yeo
611b17d79b Using struct timeval requires sys/time.h, fixes compilation on some OSes
Patch by Dave Yeo, daveryeo at telus dot net

Originally committed as revision 22425 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 07:43:56 +00:00
Martin Storsjö
db76ca7f35 Use rt->control_uri consequently instead of s->filename in all RTSP commands
Originally committed as revision 22403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 16:04:41 +00:00
Michael Niedermayer
67c10de7d2 Add special case to avoid binary search when appending index entries.
Originally committed as revision 22400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 15:19:23 +00:00
Martin Storsjö
03f8fc0897 RTSP: Resolve and use the actual IP address of the peer we're connected to,
instead of using the original host name, since the RTP (and UDP) protocols
may choose another IP address if the host name resolves into several different
addresses.

Originally committed as revision 22398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 14:59:40 +00:00
Peter Ross
fb6a32c30f Remove static function name prefixes from American Laser Games MM demuxer
Originally committed as revision 22390 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 12:37:13 +00:00
Peter Ross
cc4e8b1267 Ensure Bink demuxer returns AVERROR code when av_get_packet() fails
Originally committed as revision 22389 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 12:32:08 +00:00
David Conrad
f9ff7179ff mkvenc: Handle negative timestamps correctly
Originally committed as revision 22372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 04:23:36 +00:00
David Conrad
654b65d012 mkvenc: Don't try to write packets with unknown timestamps
Originally committed as revision 22371 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 04:23:33 +00:00
David Conrad
84d4e599a5 mkvenc: write dts for VFW mode
Originally committed as revision 22370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 04:23:28 +00:00
Baptiste Coudurier
fe3ab8adfa Fix encoder metadata string langcode in mov muxer
Originally committed as revision 22369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 01:53:16 +00:00
Baptiste Coudurier
cc255afeb5 Correctly mark mov metadata as utf-8, using iso language code
Originally committed as revision 22368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 01:21:09 +00:00
Baptiste Coudurier
08a186c648 In mov demuxer, convert mac encoded strings to utf-8
Originally committed as revision 22365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 01:03:42 +00:00
Daniel Verkamp
bf35412201 Kega Game Video (KGV1) decoder
Originally committed as revision 22364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 01:03:09 +00:00
Baptiste Coudurier
987e857f63 Preallocate index entries in mov demuxer, huge speedup
Originally committed as revision 22363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 00:46:26 +00:00
Baptiste Coudurier
8fdd542ce4 In mpegts muxer, write adts header if aac bitstream does not contain it
Originally committed as revision 22355 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 00:18:49 +00:00
Baptiste Coudurier
e17d77bb67 In mpegts muxer, search for h264 aud nal, it might not be the first nal.
Improve ther error message when bitstream is malformated and tell user to use
the bitstream filter.

Originally committed as revision 22354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 23:59:05 +00:00
Stefano Sabatini
f4495cdc00 Remove definition of match_ext(), which is declared under #ifdef
HAVE_AV_CONFIG_H and so not publicly declared, and currently unused.

Originally committed as revision 22353 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 23:51:53 +00:00
Baptiste Coudurier
7082ea56c8 mpegts vbr muxing, activated when muxing rate is not supplied by the
user.

Originally committed as revision 22352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 23:46:19 +00:00
Stefano Sabatini
4837bb52d2 Replace last occurrence of the deprecated match_ext() with
av_match_ext().

Originally committed as revision 22351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 23:46:04 +00:00
Baptiste Coudurier
677a1144b0 Start continuity counter at 0 for pmt as well
Originally committed as revision 22350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 22:44:03 +00:00
Baptiste Coudurier
d73a458f27 Start continuity counter at 0 for streams
Originally committed as revision 22344 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 20:59:00 +00:00
Baptiste Coudurier
9169174fd6 10l typo, fix ts total bit rate computation
Originally committed as revision 22343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 20:57:42 +00:00
Måns Rullgård
22f73dccad Move resolve_host() to ffserver.c
This deprecated function is only used by ffserver, yet does not have
a prototype visible there.

In the long term, ffserver should be made IPv6-aware.  In the meantime,
this change removes cruft from lavf and fixes some warnings in ffserver.

Originally committed as revision 22329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 18:43:27 +00:00
Vladimir Pantelic
88b51ea948 Use ASF supports "markers" which are a name and a time stamp to create
lavf chapters.
Patch by Vladimir Pantelic pan (arobase) nt tu (dash) darmstadt de

Originally committed as revision 22326 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 13:13:18 +00:00
Martin Storsjö
002a6d0ea6 Add doxygen documentation for ff_url_split
Originally committed as revision 22323 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 09:07:41 +00:00
Martin Storsjö
f984dcf6dd Reindent
Originally committed as revision 22322 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 09:05:03 +00:00
Martin Storsjö
c5c6e67c28 Rename url_split to ff_url_split
Since this function isn't in the public API, it should have an ff_ prefix.

Originally committed as revision 22321 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 09:03:25 +00:00
Måns Rullgård
f19341e17a Revert "Move the probe loop from av_open_input_file() into its own method"
This reverts r22296.  This change made some files to fail to open.
The patch submitter has promised to investigate next week.

Originally committed as revision 22315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 03:46:37 +00:00
Måns Rullgård
d9747e29b6 IFF: move ff_cmap_read_palette() prototype to a header file
Originally committed as revision 22307 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 02:36:00 +00:00
Wolfram Gloger
ae2c694388 Fix concat seeking SEEK_END case.
Patch by Wolfram Gloger wmglo ^ dent.med.uni-muenchen.de.

Originally committed as revision 22306 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 00:40:22 +00:00
Wolfram Gloger
35eaadcba0 Fix concat seek result.
Patch by Wolfram Gloger wmglo AT-SIGN dent.med.uni-muenchen DOT de.

Originally committed as revision 22302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 00:22:03 +00:00
Alex Converse
e7e291e960 av_find_stream_info(): Add a workaround for backwards compatible HE-AAC signaling.
The sample rate, frame size, and channel count from the container are
not reliable when backwards compatible signaling is used.

Originally committed as revision 22301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 00:00:50 +00:00
Daniel Kristjansson
663322c1b8 Fix pts->dts conversion init for non-zero initial value for pts.
Patch by Daniel Kristjansson, danielk cuymedia net

Originally committed as revision 22297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 23:10:18 +00:00
Micah F. Galizia
4245c6ec4e Move the probe loop from av_open_input_file() into its own method
av_probe_input_buffer() so that it can be reused. Here are a few
differences to the original way things were probed:

- maximum probe buffer size can be specified as a parameter.

- offset within the stream to probe from can be specified as a parameter.

- instead of seeking back to the start each time a probe fails, stream
  data is appended to the reallocated buffer. This lowers the amount
  of data read from the stream (there is no repetition) and results in
  fewer closed and reopened streams (when seeking fails).

Patch by Micah F. Galizia printf("%s%s@%s.%s", "micah", "galizia", "gmail", "com").

Originally committed as revision 22296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 22:42:11 +00:00
David Conrad
38c3b6e73e inet_aton needs _DARWIN_C_SOURCE on OS X
Originally committed as revision 22285 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 19:49:02 +00:00
David Conrad
ac11d562e5 Localize the #define _SVID_SOURCE needed for inet_aton() to os_support.c
Originally committed as revision 22284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 19:48:59 +00:00
Kostya Shishkov
f3cb1cd078 1l trocadero: forgot reference operator on bytestream_get_be32() argument
Originally committed as revision 22277 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 08:52:53 +00:00
David Conrad
457c08ba3c Add internal.h include for av_read_frame_flush prototype
Fixes build with clang

Originally committed as revision 22273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 02:35:45 +00:00
David Conrad
148e8f2d29 Fix warning about incompatible pointer types
Originally committed as revision 22272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 02:26:34 +00:00
David Conrad
e48f7ff3cb matroskadec: Fix a buffer overread
Originally committed as revision 22271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 02:26:30 +00:00
Måns Rullgård
e16c73e67e Move av_read_frame_flush() prototype to lavf/internal.h
Originally committed as revision 22268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 23:19:05 +00:00
Måns Rullgård
c26e58e32c Add some missing #includes
Originally committed as revision 22258 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 22:36:36 +00:00
Reimar Döffinger
5189573c6d Set GXF fallback time-base to match the one specified for audio-only.
Originally committed as revision 22257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 22:25:53 +00:00
Reimar Döffinger
192c14fa55 GXF time base is always based on "fields" per second even for
non-interlaced video.
Should fix issue 1766.

Originally committed as revision 22256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 22:20:33 +00:00
Martin Storsjö
814c56413d Don't explicitly initialize networking in the tcp and udp protocols
Networking is always initialized when opening protocols.

Originally committed as revision 22227 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 22:38:48 +00:00
Martin Storsjö
57b5555c91 Use ff_url_join for assembling URLs, instead of snprintf
This ensures proper escaping of numerical IPv6 addresses.

The RTSP (de)muxer needs its own network initialization, since it isn't
a protocol and url_open hasn't been called yet.

Originally committed as revision 22226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 22:35:21 +00:00
Martin Storsjö
780d7897a9 Add a function ff_url_join for assembling URLs
Originally committed as revision 22225 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 22:31:45 +00:00
Martin Storsjö
67d4b3f205 Always call ff_network_init/ff_network_close when opening protocols
ff_network_init is a no-op on all platforms except windows, and on
windows the performance penalty is minimal (less than 1 ms in my tests).

Originally committed as revision 22224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 22:30:21 +00:00
Vitor Sessak
5301a05d3e Fix memory leak in NUT muxer
Originally committed as revision 22222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 17:26:34 +00:00
Martin Storsjö
886f3f2f36 Return from rtp_read when select returns an error
Originally committed as revision 22219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 08:15:20 +00:00
David Conrad
8b6bdb6cf3 oggdec: Parse theora headers since ogg might not mark keyframes
Fixes issue746

Originally committed as revision 22214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 00:22:40 +00:00
Martin Storsjö
c2b40ac229 Check url_interrupt_cb in rtp_read, wait in select for max 100 ms before rechecking url_interrupt_cb
Originally committed as revision 22209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 15:08:54 +00:00
Peter Ross
6c88dc3dbf handle errors reported by av_get_packet() in Bink demuxer
Originally committed as revision 22208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 13:27:53 +00:00
Peter Ross
4ffa6e78c2 Guard against invalid memory read
Originally committed as revision 22207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 13:26:01 +00:00
David Conrad
871b641b80 Ensure that we write clusters and blocks with known size when streaming
Too many demuxers can't cope with clusters of unknown size.

Originally committed as revision 22201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 08:53:14 +00:00
David Conrad
434a70b8f1 Fix indentation
Originally committed as revision 22200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 08:53:11 +00:00
David Conrad
30f06a58a0 Simplify starting and ending clusters
Originally committed as revision 22199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 08:53:08 +00:00
David Conrad
7a2a484081 Write the first seekhead if writing to a stream, we won't be able to seek
back and write it at the end

Originally committed as revision 22198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 08:53:04 +00:00
David Conrad
2529bb3019 Attempt seeking to write EBML master sizes even if streamed
Most EBML masters are much smaller than IO_BUFFER_SIZE and thus the size
can be updated. This makes parsing the resulting files easier.

Originally committed as revision 22197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 08:53:00 +00:00
Anton Khirnov
690b412657 matroskaenc: use "title" tag instead of "description" in track title.
Patch by Anton Khirnov < whyskas at gmail >

Originally committed as revision 22187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 23:27:34 +00:00
Aurelien Jacobs
68b0fd7c68 matroskadec: cosmetic indentation
Originally committed as revision 22185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 21:49:24 +00:00
Joakim Plate
3e93c8ed14 matroskadec: timestamps are dts and not pts in ms vfw compatibility mode
original patch by elupus _at_ ecce _dot_ se

Originally committed as revision 22184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 21:46:43 +00:00
Martin Storsjö
b9b8ed2a02 Properly pad H.264 extradata when taken from fmtp SDP attributes
This fixes some valgrind warnings.

Originally committed as revision 22182 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 21:00:50 +00:00
Vitor Sessak
4b83fc0fe4 Plug memory leak in NUT muxer and demuxer
Originally committed as revision 22174 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 17:31:24 +00:00
Jai Menon
1f6d0d42c5 Plug memory leak in NSV demuxer.
Patch by Jai Menon.

Originally committed as revision 22173 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 17:26:00 +00:00
Peter Ross
a27998010c Support demuxing of streamed Bink files
Originally committed as revision 22166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 09:44:30 +00:00
Vitor Sessak
5eef7bcd09 Plug memory leak for truncated files
Originally committed as revision 22154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-02 21:32:56 +00:00
Vitor Sessak
38beab19ab Plug some memory leaks for truncated files
Originally committed as revision 22153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-02 21:32:29 +00:00
Vitor Sessak
8a4d067dfc Revert r22119 and partially revert 22120.
Originally committed as revision 22135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-01 18:16:10 +00:00
Anton Khirnov
e1c0b00b06 nutdec: make chapter start and length uint64_t to prevent overflows.
Patch by Anton Khirnov wyskas chez gmail punto com

Originally committed as revision 22127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-01 07:26:41 +00:00
Reimar Döffinger
11a74f3639 Explicitly set struct addrinfo to NULL if getaddrinfo failed instead of
assuming getaddrinfo will have done this.

Originally committed as revision 22123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 22:33:22 +00:00
Reimar Döffinger
a34fc5e23d Make our getaddrinfo implementation initialize "struct addrinfo" return
value to NULL on errors.

Originally committed as revision 22122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 22:31:17 +00:00
Vitor Sessak
27dbc47c05 Plug some memory leaks in NUT muxer and demuxer
Originally committed as revision 22120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 20:49:21 +00:00
Anton Khirnov
82f50f820e Print chapter info in dump_format().
Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 22113 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 18:37:09 +00:00
Michael Niedermayer
5692ed3ad4 Many mp3s seem to contain padding after id3 tags that is not considered in the
tag size. Skip this to make the format probing quicker.

Originally committed as revision 22111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 16:40:17 +00:00
Martin Storsjö
f65919af7e Rename RTP depacketizer files from rtp_* to rtpdec_*
Originally committed as revision 22109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 11:03:14 +00:00
Carl Eugen Hoyos
1e6365b305 Include rtpdec.h, it contains prototypes for the following functions:
rtp_set_remote_url(), rtp_get_local_port(), rtp_get_file_handles()

Originally committed as revision 22107 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 03:59:15 +00:00
Carl Eugen Hoyos
dda8fc6a09 Include avc.h from avc.c: It contains several prototypes.
Originally committed as revision 22098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 02:04:34 +00:00
Carl Eugen Hoyos
998257bd4f Make mp4_read_descr static: It is only used inside libavformat/mov.c.
Originally committed as revision 22097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 01:51:13 +00:00
Carl Eugen Hoyos
c53ffb2ce5 Include apetag.h which contains the prototype for ff_ape_parse_tag().
Originally committed as revision 22096 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 01:43:47 +00:00
Martin Storsjö
50ff78db01 RTSP muxer: Use a local copy of the AVPacket for sending to the chained muxer
This way, we avoid overwriting stream_index in the user's AVPacket
with a nonsense value.

Originally committed as revision 22081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-26 16:21:56 +00:00
Anton Khirnov
cba2f6d51b asfenc: write tags in proper UTF-16.
Patch by Anton Khirnov wyskas gmail com

Originally committed as revision 22059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 16:59:55 +00:00
Anton Khirnov
a677078e14 asfenc: simplify writing of comment header.
Patch by Anton Khirnov wyskas gmail com

Originally committed as revision 22058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 16:50:26 +00:00
Anton Khirnov
e4ea625ab0 asfdec: don't strip the "WM/" prefix, this should be done during conversion.
Patch by Anton Khirnov wyskas gmail com

Originally committed as revision 22057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 16:38:23 +00:00
Benoit Fouet
a5517dcc9a asf: indent.
Patch from Anton Khirnov wyskas gmail com

Originally committed as revision 22050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 09:10:37 +00:00
Benoit Fouet
9b54f4328e asf: add more entries to metadata conv table.
Patch from Anton Khirnov wyskas gmail com

Originally committed as revision 22049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 09:09:39 +00:00
Anton Khirnov
fce4448948 Read ASF metadata as proper UTF-16 and spit it out as proper UTF-8 in our
metadata system.

Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22034 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 18:19:54 +00:00
Anton Khirnov
a106d4112d Don't add WM prefixes to all written ASF tags.
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 18:17:32 +00:00
Anton Khirnov
531d8fa308 Eliminate put_str16().
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22031 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 18:09:49 +00:00
Anton Khirnov
6164842300 Mention that metadata tags are (unvalidated) UTF-8.
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22028 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 18:01:44 +00:00
Peter Ross
dd80be5bfc low-complexity Bink file seeking
Originally committed as revision 22022 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 11:43:33 +00:00
Peter Ross
7e276c85b1 set AVINDEX_KEYFRAME correctly for bink
Originally committed as revision 22021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 11:30:38 +00:00
Yann Coupin
8d819221db Correctly increment continuity_counter in PCR packets.
Patch by Yann Coupin, yann.coupin+ffmpeg gmail

Originally committed as revision 22020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 10:56:13 +00:00
Benoit Fouet
6538c0f1c6 asfdec: skip byte array tags.
Patch from Anton Khirnov wyskas gmail

Originally committed as revision 22019 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 07:34:12 +00:00
Benoit Fouet
27e7492771 asfdec: add a debug message about skipped tags.
Patch from Anton Khirnov wyskas gmail

Originally committed as revision 22018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 07:33:18 +00:00
Benoit Fouet
47794b9d3e asfdec: fix a memleak.
Patch from Anton Khirnov wyskas gmail

Originally committed as revision 22017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 07:32:20 +00:00
Benoit Fouet
514b73cf0d asfdec: only unicode tags must have even length.
Patch from: Anton Khirnov wyskas gmail

Originally committed as revision 22016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 07:31:03 +00:00
Anton Khirnov
43382b5f13 Introduce metadata conversion table for NUT muxer and demuxer.
Patch by Anton Khirnov (wyskas, do no evil mail)
Thread "[PATCH] nut metadata conversion table"

Originally committed as revision 22015 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 06:27:12 +00:00
Michael Niedermayer
ab392695d5 Count all frames with codec_info_nb_frames not just ones with non zero
duration. I hope this breaks nothing. Its needed for my fix of issue1156

Originally committed as revision 22001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 16:29:57 +00:00
Michael Niedermayer
6c6e6ef5e2 Put codec_info_nb_frames back in AVStream and print its value.
This way streams with no or very few frames can be avoided during
auto selection

Originally committed as revision 21998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 15:07:18 +00:00
Peter Ross
02cd6f5426 Set video stream duration for Bink demuxer
Originally committed as revision 21996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 11:15:18 +00:00
Martin Storsjö
9399393333 Cosmetics: reindent
Originally committed as revision 21995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 11:05:36 +00:00
Peter Ross
b62c65f23e Bink audio pts starts at 0, not reported_size
Originally committed as revision 21994 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 11:01:51 +00:00
Kostya Shishkov
a45972a806 Make Bink demuxer pass video flags to decoder
Originally committed as revision 21978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 06:36:26 +00:00
Ronald S. Bultje
3307e6ea86 Prefix non-static RTSP functions with ff_.
Originally committed as revision 21974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 00:35:50 +00:00
Michael Niedermayer
b7884740fa Make sure mp1/mp2 get their frame_size set.
Fixes issue1696

Originally committed as revision 21972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 22:05:20 +00:00
Martin Storsjö
6f5a3d0a7b Add an RTSP muxer
Originally committed as revision 21971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 21:28:19 +00:00
Martin Storsjö
f86f665623 Free metadata in chained RTP muxers in the RTSP muxer
This fixes a minor memory leak

Originally committed as revision 21970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 21:20:30 +00:00
Martin Storsjö
af037f8098 Cosmetics: reindent
Originally committed as revision 21969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 19:47:22 +00:00
Martin Storsjö
15ba23150e Add declarations and doxygen documentation of generic rtsp support functions
to rtsp.h, and make the functions non-static

Originally committed as revision 21968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 19:44:08 +00:00
Martin Storsjö
2efc97c2fe Cosmetics: reindent after applying patches
Originally committed as revision 21967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 16:11:38 +00:00
Martin Storsjö
35cfd6464e Don't follow RTSP redirects when used as a muxer
Originally committed as revision 21966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 15:57:40 +00:00
Martin Storsjö
3e24c7701c Add a function rtsp_setup_output_streams for announcing the SDP
and setting up the internal RTSPStream data structures when using
the RTSP code in muxer mode.

Originally committed as revision 21965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 15:56:18 +00:00
Martin Storsjö
fd450a5177 Create AVFormatContext objects as private transport for output RTSP sessions
Originally committed as revision 21964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 15:46:56 +00:00
Michael Niedermayer
0e5f33f242 Make sure a set r_frame_rate is not overriden by a guess.
Also make sure we dont waste time in this case with collecting timestamps.

Originally committed as revision 21957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 10:19:46 +00:00
Michael Niedermayer
403c545d08 Attempt to fix the completely random values returned by ff_avc_find_startcode().
Originally committed as revision 21955 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 00:34:27 +00:00
Vitor Sessak
044a950d82 Fix memory leak for truncated packets in idCin demuxer
Originally committed as revision 21938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-21 14:41:39 +00:00
Michael Niedermayer
bbdf0d2214 Make sure we dont write more bytes into filename than the array is long.
just a precaution in case the size of the source array is increased or
made dynamically allocateable.

Originally committed as revision 21926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-20 22:57:23 +00:00
Michael Niedermayer
6a2459059e Do not attempt to open references through absolute pathes.
This would allow an attacker to test remotely if a local file exists.

Originally committed as revision 21925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-20 22:48:09 +00:00
Vitor Sessak
2e5195646d Do not leave uninitialized data in the packet in MPC demuxer. Should allow for
adding a demuxer test to FATE.

Originally committed as revision 21916 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-20 11:22:47 +00:00
Martin Storsjö
4280f9bbcd Split rtsp_read_header() into two functions, so that the main part (now also
known as rtsp_connect()) can be used in the RTSP muxer.

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21915 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 23:23:40 +00:00
Martin Storsjö
e23d195deb Split out input-specific parts of rtsp_read_header() into its own, new,
function (rtsp_setup_input_streams()), as preparation for the upcoming
RTSP muxer.

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21914 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 23:21:44 +00:00
Martin Storsjö
30ff7c5cbc Only send out NAT-punching RTP/RTCP packets when we're in demuxer mode, i.e.
don't send them when acting as a RTSP muxer.

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 23:13:21 +00:00
Martin Storsjö
69adcc4ffb Use mode=receive instead of mode=play if in RTSP muxer (instead of demuxer)
mode.

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 23:11:59 +00:00
Martin Storsjö
52aa4338cc Make rtsp_close_streams() take a AVFormatContext instead of a RTSPState
argument, so we can use AVFormatContext->* here in the future.

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21911 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 23:10:19 +00:00
Kostya Shishkov
ce8f750c29 WavPack demuxer also depends on APE tag parser
Originally committed as revision 21909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 22:13:19 +00:00
Kostya Shishkov
8cdfa4747b Make Bink demuxer skip all zero audio tracks, not only the first one
Originally committed as revision 21908 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 22:10:04 +00:00
Daniel Verkamp
df17dbf73c AEA demuxer requires raw.o for pcm_read_seek
Originally committed as revision 21905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 21:12:46 +00:00
Vitor Sessak
cdfc38f43b Fix memory leak for truncated frames
Originally committed as revision 21901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 20:20:17 +00:00
Vitor Sessak
df2235a165 Fix memory leak for truncated frames
Originally committed as revision 21900 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 20:19:41 +00:00
Martin Storsjö
251f050481 Remove stale function declaration.
Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 17:26:33 +00:00
Martin Storsjö
c02fd3d2e8 Rename RTSP_STATE_PLAYING to _STREAMING, since that better covers the
future use of the rtsp* codebase for RTSP muxing.

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 16:26:21 +00:00
Kostya Shishkov
f4f2160880 WavPack demuxer supports ID3v1 tags, so don't forget id3v1.o dependency for it
in Makefile

Originally committed as revision 21891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 06:59:47 +00:00
Kostya Shishkov
bf7c17192f Make RTMP client send bytes read report
Originally committed as revision 21882 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-18 16:27:18 +00:00
Martin Storsjö
dfd017bf0a Add functions to send RTSP commands with content attached to them. This will
be used eventually in the RTSP muxer (see thread "[PATCH] RTSP muxer, round
3" on mailinglist).

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21862 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-17 19:24:02 +00:00
Ronald S. Bultje
fc78b0cb7e Remove first_rtcp_ntp_time. This is used to prevent overflow of the timestamp,
but doesn't actually do that. What's worse, it creates timestamp adjustments
that are different per stream within a session, leading to a/v sync issues.

See discussion in thread "[FFmpeg-devel] rtp streaming x264+audio issues (and
some ideas to fix them)". Patch suggested by Luca Abeni <lucabe72 email it>.

Originally committed as revision 21857 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-16 23:00:03 +00:00
Martin Storsjö
9c8fa20d7e When using RTP-over-UDP, send dummy packets during stream setup, similar to
what e.g. RealPlayer does. This allows proper port forwarding setup in NAT-
based environments.

Patch by Martin Storsjö <$firstname at $firstname dot st>.

Originally committed as revision 21856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-16 22:50:50 +00:00
Ronald S. Bultje
a636b58ce1 Fix two problems (no idea how this ever worked):
- the return value of url_open_dyn_*buf() is 0 on success, so using
   if (!(res = url_open_dyn_*buf())) return res; is not going to work
- url_open_dyn_packet_buf actually writes the max_packet_size before
   each piece of data. Feeding this to the ASF demuxer will never work.
   Therefore, use url_open_dyn_buf() instead.

Originally committed as revision 21853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-16 19:26:49 +00:00
Ronald S. Bultje
4abd85141c Revert r21851.
Originally committed as revision 21852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-16 18:25:05 +00:00
Ronald S. Bultje
298d2fd304 Don't return 0 if buffer setup failed. That signals the RTSP demuxer that
the packet was filled in, leading to virtually random behaviour in the
decoder later on. Instead, return a negative value.

Originally committed as revision 21851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-16 18:19:28 +00:00
Anton Khirnov
ed7694d8cf Set lavf identification string globally in av_write_header(), rather
than inside the muxers. Remove special handling of "encoder" tags from
AVI and MP3 muxers.

Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 21850 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-16 16:32:25 +00:00
Peter Ross
899605f150 Support IFF ANNO (annotation) chunk type
Originally committed as revision 21847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-16 09:55:56 +00:00
Anton Khirnov
83a6c1a69c Strings in extended content header are UTF16,
so terminating NULLs are 2 bytes long, not 1.

Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 21841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-15 21:19:40 +00:00
Anton Khirnov
4a3104a96a workaround for broken files created by previous versions of asfenc.
Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 21840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-15 21:14:47 +00:00
Reimar Döffinger
4130f7393b Reindent
Originally committed as revision 21824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-14 19:00:36 +00:00
Reimar Döffinger
3adcfbbeb5 Optimize h261_probe function, since it is far slower than all others.
About 5 times faster.

Originally committed as revision 21823 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-14 18:59:56 +00:00
Ben Littler
4bf2b9e8f3 add netspeak gsm and truespeech wav format tags to riff.c
Originally committed as revision 21797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-13 17:57:24 +00:00
Måns Rullgård
f2a4f12cb6 Do not call lseek() with invalid whence value
Originally committed as revision 21795 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-13 16:56:37 +00:00
Michael Niedermayer
ab5a0175f5 Add flag so muxers not needing width/height can signal this.
Add this flag to img2 (fixes -vcodec copy to image2 in some cases)

Originally committed as revision 21773 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-12 20:35:29 +00:00
Peter Ross
cbd3441eec Make DeluxePaint Animation demuxer actually return the find_record() error code (issue 1739).
Originally committed as revision 21769 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-12 11:31:35 +00:00
Michael Niedermayer
86d58bcfd9 Add GEOV fourcc (issue971).
Originally committed as revision 21768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-12 01:37:53 +00:00
Michael Niedermayer
f2d56513d7 Fix timestamps.
Originally committed as revision 21761 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-11 22:32:46 +00:00
Daniel Verkamp
f45a27dc52 Reindent
Originally committed as revision 21747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-10 20:27:53 +00:00
Daniel Verkamp
b7e0f88f2b Fix demuxing of wav files with broken data header
Originally committed as revision 21746 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-10 20:26:47 +00:00
Reimar Döffinger
f0cb55af88 Use av_compare_ts from libavutil instead of the locale compare_ts, the
calculations in the later one are not correct with large time stamps.

Originally committed as revision 21744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-10 19:43:57 +00:00
Timo Teräs
4e8052ddad Fix syncronisation for streams with a high encoding delay.
Patch by Timo Teräs (timo DOT teras AT iki DOT fi)

Originally committed as revision 21743 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-10 19:33:08 +00:00
Ronald S. Bultje
7515ed0c1d Reindent after r21741.
Originally committed as revision 21742 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-10 18:31:47 +00:00
Ronald S. Bultje
170870b77c Don't forget to set known audio parameters (samplerate, etc.) if the codec is
not supported in FFmpeg. This will cause crashes later because the samplerate
is used to initialize the timebase.

Originally committed as revision 21741 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-10 18:30:55 +00:00
Ronald S. Bultje
556aa7a102 RTP/AMR depacketizer, by Martin Storsjö <$firstname at $firstname dot st>.
Originally committed as revision 21740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-10 17:20:50 +00:00
Michael Niedermayer
0332324a48 Dont give up after 100kb of zero bytes but returnd EAGAIN
fixes issue1729

Originally committed as revision 21738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-10 14:25:57 +00:00
Andreas Öman
80242f9bdb mp3: ftell() file offset for VBR tags before ID3v1 parser messes it up.
Originally committed as revision 21737 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-10 12:44:16 +00:00
Stefano Sabatini
fe4fbb583d Doxument url_fopen().
Originally committed as revision 21714 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-09 18:59:34 +00:00
Reimar Döffinger
be4a113264 Make sure the header value used to avoid repeating headers on seeking to the
start and to avoid initializing codecs with missing headers is set for all streams.
Fixes issue 1723.

Originally committed as revision 21693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-08 20:25:36 +00:00
Ronald S. Bultje
04a2b04b98 Implement gai_strerror() for systems lacking such functionality. Patch
by KO Myung-Hun <komh challion net>.

Originally committed as revision 21692 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-08 18:48:12 +00:00
David Conrad
ecc0027bc6 Fix playback with invalid files that don't set the continuation flag for
pages that continue packets started in prior pages.
Fixes issue1248

Originally committed as revision 21688 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-08 10:13:03 +00:00
Michael Niedermayer
e6406939a8 Directly use av_rescale_rnd() instead of av_convert_ts() as this cuts the
number of calls to it down by 2.

Originally committed as revision 21676 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-07 19:10:04 +00:00
Michael Niedermayer
e5026c36d4 Use av_compare_ts() for interleaving per dts.
Originally committed as revision 21672 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-07 16:27:17 +00:00
Michele Orrù
084eb95fd5 Implement a physical concatenation protocol.
Patch by Michele Orrù reverse(<moc.liamg@yp.rekam>).

Originally committed as revision 21666 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-07 10:25:58 +00:00
Anton Khirnov
04d2540c4b Add AVI metadata conversion table.
Patch by Anton Khirnov (gmail{wyskas}).

Originally committed as revision 21653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-06 12:32:44 +00:00
Stefano Sabatini
4e38c09433 Doxument url_fdopen().
Originally committed as revision 21647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-05 23:03:32 +00:00
Michael Niedermayer
ffdf0d48fc strn muxing in avi support.
untested as ffmpeg.c has no means to set AVStream metadata (patchwelcome)

Originally committed as revision 21644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-05 15:14:56 +00:00
Michael Niedermayer
7a9af8ec19 Support strn tag in avidec.
Originally committed as revision 21643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-05 12:16:59 +00:00
Michael Niedermayer
1ac0893799 Correcting wrong looking stream_id validity check in avidec.
Originally committed as revision 21642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-05 11:50:44 +00:00
Michael Niedermayer
8c3b161e9e Dont try generic seek if seek request before first index entry and backward.
Fixes issue1275

Originally committed as revision 21633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-03 23:59:48 +00:00
Michael Niedermayer
43e4d57f66 Try to open decoders in av_find_stream_info() even if no packets for the
stream are found.
Fixes issue1385

Originally committed as revision 21630 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-03 23:05:58 +00:00
Peter Ross
451b353d87 Indentation cleanup
Originally committed as revision 21624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-03 09:58:14 +00:00
Peter Ross
02c4f626a8 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
Originally committed as revision 21623 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-03 09:57:21 +00:00
Michael Niedermayer
3c8d75e65b Only set duration for streams where it is likely correct.
Fixes issue1120

Originally committed as revision 21620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-03 00:35:10 +00:00
Michael Niedermayer
bce8840a4e Set nb_frames.
Also add DXSA tag (commited by mistake in this commit, i can revert and recommit
seperately if someone wants)

Originally committed as revision 21619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 23:53:38 +00:00
Justin Johnson
c5e1e9827d Guess the duration before converting video and write guessed duration
into flv header.

Patch by Justin Johnson, justin D johnson3 A gmail

Originally committed as revision 21615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 22:23:09 +00:00
Michael Niedermayer
c45ebd5461 Set AVPacket.pos in MPEG-PS demuxer.
Originally committed as revision 21604 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 16:47:51 +00:00
Måns Rullgård
0694a009b6 Fix build
Originally committed as revision 21602 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 23:30:30 +00:00
Alexis Ballier
9125806e34 Fix warnings about implicit function declaration when compiling rtpdec.c
Patch by Alexis Ballier, alexis D ballier A gmail

Originally committed as revision 21601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 23:10:04 +00:00
Anton Khirnov
ca76a11948 Add a list of generic tags and change demuxers to follow it.
Patch by Anton Khirnov, wyskas at gmail dot com

Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 11:39:10 +00:00
Michael Niedermayer
411ff3225f Increase search range if no end timestamp could be found for the duration
calculation.

Originally committed as revision 21577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-31 17:43:18 +00:00
Kostya Shishkov
971c55f186 Bink video codec id is there, demuxer can use it
Originally committed as revision 21574 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-31 16:21:49 +00:00
Peter Ross
40da0b3691 Latent libavformat version bump for Bink demuxer (r21569)
Originally committed as revision 21571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-31 13:01:00 +00:00
Peter Ross
2e375df5b2 Bink demuxer
Originally committed as revision 21569 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-31 12:35:09 +00:00
Michael Niedermayer
c55806e3a2 Flag to ignore dts on frames that contain pts.
This works around common issues with mpeg-ps files with broken timestamps.
Also allows playing the broken sample from issue1024.

Originally committed as revision 21562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 22:55:12 +00:00
Reimar Döffinger
029ddf333c Store strings directly in mov_mdhd_language_map instead of using pointers,
which has a up to 200% overhead.
Also allows to use memcpy instead of strcpy.

Originally committed as revision 21560 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 22:05:26 +00:00
Reimar Döffinger
1c90d2985d Always consider the mov language code as 4 bytes fixed size and change the
function declaration to reflect this.

Originally committed as revision 21558 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 21:54:06 +00:00
Reimar Döffinger
832ec42858 Simplify conversion to 5-bit ASCII.
Originally committed as revision 21557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 21:50:47 +00:00
Stefano Sabatini
8757dc5e40 Remove duplicated empty line.
Originally committed as revision 21553 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 20:18:55 +00:00
Daniel Verkamp
2a33c673b1 Set duration in Smacker demuxer
Originally committed as revision 21538 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 10:37:52 +00:00
Daniel Verkamp
895ab7489b Demux Bink audio in Smacker files
Originally committed as revision 21537 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 10:31:10 +00:00
Kostya Shishkov
adb5496146 another 10l: forgot to change parent condition as well
Originally committed as revision 21535 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 09:47:57 +00:00
Kostya Shishkov
b381a823cd 10l trocadero: now return value of ff_rtmp_packet_read() has different meaning
Originally committed as revision 21534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 09:45:52 +00:00
Kostya Shishkov
0b6b10d9da Make RTMP send/receive packet functions report number of bytes read or sent.
Originally committed as revision 21533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 09:24:52 +00:00
Kostya Shishkov
09b67cc4bd cosmetics: add an empty line between variable declarations and code
Originally committed as revision 21532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 08:38:11 +00:00
Baptiste Coudurier
012dc2c426 Remove MAX_STREAMS usage in ogg and mxf muxers
Originally committed as revision 21526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-29 06:38:00 +00:00
Ronald S. Bultje
45aa90807f Add RTP/H.263 depacketizer by Martin Storsjö <$firstname () $firstname st>.
Originally committed as revision 21512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 16:08:13 +00:00
Jai Menon
90d0379f5e Avoid using deprecated AVFormatParameters::[audio|video]_codec_id field.
Originally committed as revision 21511 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 15:45:21 +00:00
Daniel Kristjansson
31277aebd9 Use av_mallocz in url_open_protocol for URLContext.
Patch by Daniel Kristjansson: danielk cuymedia net

Originally committed as revision 21501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 09:11:26 +00:00
Michael Niedermayer
12f1b1fec4 Remove last MAX_STREAMS from avienc.c
Originally committed as revision 21500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 03:37:22 +00:00
Michael Niedermayer
b4f0e04c99 Introduce AVIStream struct and move stream based variables to it.
This removes all but one MAX_STREAM from avienc.c.

Originally committed as revision 21498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 02:45:17 +00:00
Carl Eugen Hoyos
39c6b3f54c Support demuxing Blu-ray subtitles in matroska files.
Patch sent to mailing list by Taylor Ralph, taylor D ralph A gmail

Originally committed as revision 21491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 22:39:18 +00:00
Ronald S. Bultje
88248b76af Fix BSD compile (PF_UNSPEC is not a standard define, AF_UNSPEC is).
Originally committed as revision 21490 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 22:31:13 +00:00
Michael Niedermayer
d30a8beb99 Fix duration calculation in the presence of a single wraping of the timeline.
Fixes issue1714.

Originally committed as revision 21485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 19:37:52 +00:00
Jai Menon
ad5cc780c0 Schedule an increase in the maximum number of streams
at next libavformat major version bump.

Originally committed as revision 21484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 19:13:35 +00:00
Michael Niedermayer
67b678bb40 Revert Revision: 21473
Log:
	Fix misc typos, patch by
	Fabian Greffrath base64_decode(PGZhYmlhbkBncmVmZnJhdGguY29tPg==).
This violates the spec.

Originally committed as revision 21478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 13:03:53 +00:00
Stefano Sabatini
e8a9d01846 Fix misc typos, patch by
Fabian Greffrath base64_decode(PGZhYmlhbkBncmVmZnJhdGguY29tPg==).

Originally committed as revision 21473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 00:31:52 +00:00
Stefano Sabatini
d19a046ebb Document av_register_protocol(), not that it really needs to be
documented but it's nice to have everything documented.

Originally committed as revision 21471 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 00:21:28 +00:00
Jeremy Morton
2700063655 Don't use tcp_fd if we're not using TCP-based connections (e.g. when
reading direct SDP files to set up UDP-based RTP-streams). Fixes
issue 1713. Patch by Jeremy Morton <ffmpeg game-point net>.

Originally committed as revision 21461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-26 15:51:54 +00:00
Martin Storsjö
6023d84a2b Load the proper getaddrinfo functions from ws2_32.dll, if they're present.
Patch by Martin Storsjö <martin at martin dot st>.

Originally committed as revision 21443 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-25 01:28:01 +00:00
Stefano Sabatini
b0634fd11e Doxument url_open().
Originally committed as revision 21437 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-24 22:07:32 +00:00
Carl Eugen Hoyos
895a9be60c Force codec_tag I420 for Quicktime Planar Y'CbCr 8-bit 4:2:0 raw codec,
because YV12 triggers an UV swap in rawdec.c, fixes issue 1687.

Originally committed as revision 21436 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-24 21:37:35 +00:00
Stefano Sabatini
725b3da981 Favor the term "URL" over "filename", as the API deals with URLs
rather than with simple filenames.

Originally committed as revision 21429 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-24 18:18:03 +00:00
Reimar Döffinger
f1d2b5728c Make url_read_complete handle EAGAIN more intelligently.
Only retry 2 - 5 times in quick succession and afterwards sleep a bit
to avoid creating high CPU load without any progress.

Originally committed as revision 21427 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-24 18:09:46 +00:00
Stefano Sabatini
f1f78a9d85 Doxument url_close().
Originally committed as revision 21420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-24 16:33:56 +00:00
Stefano Sabatini
333146ddc5 Doxument url_open_protocol().
Originally committed as revision 21417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-24 13:31:25 +00:00
Stefano Sabatini
1f8ad15ad3 Doxument url_read().
Originally committed as revision 21415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-24 13:07:54 +00:00
Reimar Döffinger
ddb901b74d Make url_read_complete retry on EAGAIN and return how much data it read
if it reached EOF, making it useful in more cases.

Originally committed as revision 21393 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-23 10:23:47 +00:00
Ronald S. Bultje
98287358e9 Print a warning when DATA chunk is encountered in the middle of chunk.
From multirate RM patch by Ronald S. Bultje

Originally committed as revision 21392 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-23 09:42:52 +00:00
Stefano Sabatini
54a4f36d6e Remove conditional M_PI definition, it is already defined in
libavutil/mathematics.h indirectly included by libavformat/avformat.h.

Originally committed as revision 21388 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 23:16:23 +00:00
Martin Storsjö
a52ce57d4e Replace deprecated guess_format() with av_guess_format().
Patch by Martin Storsjö reverse(<ts.nitram@nitram>).

Originally committed as revision 21387 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 23:09:08 +00:00
Ronald S. Bultje
6481075443 Make style a little bit more K&R'ish.
Originally committed as revision 21383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 16:12:55 +00:00
Martin Storsjö
7c823d8b7f Rename a function which is no longer ipv6-specific. Patch by Martin Storsjö
<$firstname () $firstname st>.

Originally committed as revision 21382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 16:10:08 +00:00
Alan Steremberg
00eb13e05f Use the control URI from the SDP (if present) rather than the input filename,
if present. This fixes playback of a number of MS-RTSP streams, mostly these
for which playback contains a session key in the URI. Fixes issue 1697.
Patch by Alan Steremberg <$firstname dot $lastname () gmail com>.

Originally committed as revision 21381 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 16:04:15 +00:00
Rafaël Carré
e380b9182b mkvenc: Write TrackTimecodeScale
patch by Rafael (dot) Carre (a) gmail (d) com

Originally committed as revision 21372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 20:49:27 +00:00
Ronald S. Bultje
2e13ecfeca Remove reply and content_ptr arguments from rtsp_send_cmd_async(), since
they are unused.

Originally committed as revision 21371 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 20:04:17 +00:00
Ronald S. Bultje
f8c087333d Change on rtsp_send_cmd() to the _async() version since we don't use the
response anyway.

Originally committed as revision 21370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 20:01:11 +00:00
Ronald S. Bultje
7eaa646fd6 Reindent after r21368.
Originally committed as revision 21369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 19:50:40 +00:00
Ronald S. Bultje
8b9457deab Pretty embarassing bug; we shouldn't use av_strlcatf() on an uninitialized
buffer, that is doomed to not work at some point.

Originally committed as revision 21368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 19:48:30 +00:00
Martin Storsjö
073189917e Make output-example.c handle AAC audio.
Patch by Martin Storsjö martin martin st

Originally committed as revision 21367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 17:10:13 +00:00
Martin Storsjö
b4d68544c8 Remove IPv4-only codepath. Patch by Martin Storsjö <$first $first st>.
Originally committed as revision 21365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 15:42:05 +00:00
David Conrad
0fc07ad951 Set start_time and duration in AVStream instead of AVFormatContext for
formats with only one stream; the AVFormatContext values will be derived from
the AVStream and this helps in calculating stream bitrate.

Originally committed as revision 21361 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 09:47:02 +00:00
Martin Storsjö
3d7b42f97b Use the configure check from r21351 and use it to properly define struct
sockaddr (in case it's not missing) so it always works on the system that
we are defining it for, in a RFC-2553/3493-compliant way (i.e. containing
a ss_family field). which is used in udp.c. Patch by Martin Storsjö
<$firstname $firstname st>.

Originally committed as revision 21352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-20 17:26:14 +00:00
Baptiste Coudurier
fdf4662211 fetch flv duration from file if it is set to 0 in metadata
Originally committed as revision 21329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-19 19:41:24 +00:00
Baptiste Coudurier
49c43fc278 reindent
Originally committed as revision 21311 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 23:58:10 +00:00
Baptiste Coudurier
c3aeaa540d set average frame rate in mov demuxer
Originally committed as revision 21310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 23:56:04 +00:00
Baptiste Coudurier
c956611527 move aspect ratio code at the end of the track parsing, fix cathedral-beta2-400extra-crop-avc.mp4
Originally committed as revision 21301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 21:38:39 +00:00
Luca Abeni
22c1f65fa6 Rename the RTP muxer sources so that the packetisation functions are in
rtpenc_*.c files.

Originally committed as revision 21284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 13:44:12 +00:00
Luca Abeni
47a855648f Remove the ff_rtp_send_h264() prototype from rtp_h264.h (such function
belongs to the RTP muxer, and its prototype already is in rtpenc.h)

Originally committed as revision 21282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 11:18:25 +00:00
Ben Littler
5bc3fc2187 add uldx fourcc to mpeg4 in riff.c
Originally committed as revision 21279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 03:57:01 +00:00
Ben Littler
6667d5a5e5 add vspx fourcc to mpeg4 in riff.c
Originally committed as revision 21269 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-17 19:25:49 +00:00
Stefano Sabatini
ade5b91dda Use av_match_ext() rather than the deprecated match_ext(), fix
warnings.

Originally committed as revision 21263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-17 15:57:51 +00:00
Måns Rullgård
48fdb66c68 Fix comment typo carefull -> careful
Spotted by someone on IRC.

Originally committed as revision 21261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-17 13:39:34 +00:00
Carl Eugen Hoyos
45becaf337 Fix indentation after r21257.
Originally committed as revision 21258 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-17 00:27:22 +00:00
Michael Karcher
1454618426 Support demuxing of Sony OpenMG files without metadata header.
Original patch by Michael Karcher, ffmpeg A mkarcher dialup fu-berlin de

Originally committed as revision 21257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-17 00:23:08 +00:00
ami_stuff
8be7ac98ca Support decoding of SoftLab-NSK VideoTizer.
Patch by ami_stuff, ami_stuff o2 pl

Originally committed as revision 21245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-16 13:13:49 +00:00
Måns Rullgård
a482e61bd6 Add symbol versioning for shared libraries
Based on patch by Reinhard Tartler <siretart tauware de>

Originally committed as revision 21236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-16 04:49:02 +00:00
Carl Eugen Hoyos
59ea69ef54 Support decoding of Avid uncompressed mov files, fixes issue 1685.
Originally committed as revision 21223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-15 11:03:40 +00:00
Carl Eugen Hoyos
a0ae3e41f3 Support decoding Avid 1:1x codec, (partially) fixes issue1684.
Originally committed as revision 21222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-15 10:55:31 +00:00
Peter Ross
574b183d64 Latent libavformat version bump and documentation update for Adobe Filmstrip muxer and demuxer (r21212)
Originally committed as revision 21213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-14 14:02:06 +00:00
Peter Ross
83ab7f1883 Adobe Filmstrip muxer and demuxer
Originally committed as revision 21212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-14 12:55:44 +00:00
Andrew Wason
ff5ab5c8c9 set stream aspect from mov tkhd width/height, patch by Andrew Wason, rectalogic at rectalogic dot com
Fixes issue 671.

Originally committed as revision 21210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-14 00:32:36 +00:00
Baptiste Coudurier
49544546b0 do not skip mdat data if it's the last atom, avoids one seek
Originally committed as revision 21209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 23:33:29 +00:00
Baptiste Coudurier
08c8e66a99 restore old buffer content when seek failed in http protocol, fix issue #1631
Originally committed as revision 21208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 23:27:52 +00:00
Baptiste Coudurier
a1f42882e1 revert wrongly commited hunk in r21205
Originally committed as revision 21207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 22:57:37 +00:00
Baptiste Coudurier
10061cd648 remove useless type declarations
Originally committed as revision 21206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 22:52:22 +00:00
Baptiste Coudurier
dcc2220ab5 remove useless declarations from mpegts.h
Originally committed as revision 21205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 22:50:26 +00:00
Baptiste Coudurier
33931016e5 use codec rc_max_rate if set and warn if bit rate is not set
Originally committed as revision 21204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 22:23:29 +00:00
Baptiste Coudurier
01d6bd525a Do not split audio frames accross pes packets.
This was not supported by some equipment and cisco analyzer.

Originally committed as revision 21203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 22:21:45 +00:00
Mike Scheutzow
907d916627 print more debug info about muxing parameters, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com
Originally committed as revision 21201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 21:42:55 +00:00
Mike Scheutzow
c054f372e0 update mpegts_write_pes documentation, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com
Originally committed as revision 21200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 21:40:37 +00:00
Mike Scheutzow
4df3bbbc68 Insert null packets to keep pcr values correct, patch by Mike Scheutzow,
scheutzow at alcatel-lucent dot com and Niobos, niobos at dest-unreach dot be.

Originally committed as revision 21199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 20:44:56 +00:00
Mike Scheutzow
49f6fd8f3f move pcr/sdt/pat period computation after ts->mux_rate is set, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com
Originally committed as revision 21198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 20:30:55 +00:00
Mike Scheutzow
6b18a3f5ba output a pcr as soon as possible, patch by Mike Scheutzow, scheutzow at alcatel-lucent dot com
Originally committed as revision 21197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 20:26:59 +00:00
Niobos
906c16a11a fix ts packet header size computation, patch by Niobos, niobos at dest-unreach dot be
Originally committed as revision 21196 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 20:20:05 +00:00
Niobos
080cabffca fix sdt, pat, pcr size computation, patch by Niobos, niobos at dest-unreach dot be
Originally committed as revision 21195 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 20:14:53 +00:00
Luca Abeni
fad9a42ad4 The RTP muxer does not need rtp_asf.c
Originally committed as revision 21194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 18:27:21 +00:00
Luca Abeni
3f60d2d327 Remove the inclusion of unneeded headers
Originally committed as revision 21193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 18:18:21 +00:00
Ronald S. Bultje
9d50d39629 Fix issue1658 (trailing space in rtpmap descriptor).
Originally committed as revision 21187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 15:55:42 +00:00
Tomas Härdin
094a63f1f6 Check there is a stream before writing header.
Patch by Tomas Härdin: $(name) punto hardin chez codemill dot se

Originally committed as revision 21186 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 14:32:48 +00:00
Ronald S. Bultje
2edabfdfdb Reindent after r21166.
Originally committed as revision 21167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-12 16:36:23 +00:00
Tomas Härdin
08f7a8ac32 Use chunked encoding for HTTP uploads. Patch by Tomas Härdin
<$firstname.$lastname()codemill,se>.

Originally committed as revision 21166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-12 16:36:00 +00:00
Martin Storsjö
51a269cd97 Make sure the destination address is written as an IP address in the SDP
Patch by Martin Storsjo (martin AT martin DOT st)

Originally committed as revision 21163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-12 10:56:43 +00:00
Sergiy
56e29bf2c9 Correct timestamps inside FLV data received by RTMP.
Patch by Sergiy (gmail(piratfm))

Originally committed as revision 21161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-12 07:10:47 +00:00
Art Clarke
e2ee11e868 Use old-style RTMP handshake for old servers.
This fixes issue streaming from Red5 server.
Patch by Art Clarke (aclarke@`echo xyzzy|sed s/y/u/|sed s/y/le/|tr z g`.com)

Originally committed as revision 21160 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-12 06:44:49 +00:00
Carl Eugen Hoyos
0941ee0fa6 Support uncompressed ("Resolution 1:1") Avid AVI Codec, (partially) fixes issue 1474.
Originally committed as revision 21154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-12 00:29:26 +00:00
Luca Abeni
4bf0faaafe Remove the inclusion of unneeded headers
Originally committed as revision 21152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 19:55:14 +00:00
Martin Storsjö
5d629b72cb Provide a fallback for getnameinfo() also. Patch by Martin Storsjö
<$firstname()$firstname,st>.

Originally committed as revision 21150 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 17:45:17 +00:00
Martin Storsjö
34a65f1fdd Implement a fallback for struct sockaddr_storage if not available.
Patch by Martin Storsjö <$firstname()$firstname,st>.

Originally committed as revision 21149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 17:42:35 +00:00
Martin Storsjö
fdcdd5396e Use getaddrinfo() instead of resolve_host(). Patch by Martin Storsjö
<$firstname()$firstname,st>.

Originally committed as revision 21147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 17:32:40 +00:00
Martin Storsjö
f1888474fa Deprecate resolve_host(). Patch by Martin Storsjö <$firstname()$firstname,st>.
Originally committed as revision 21146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 17:28:55 +00:00
Martin Storsjö
fa053ca725 Provide fallback implementations of getaddrinfo() and freeaddrinfo().
Patch by Martin Storsjö <$firstname()$firstname,st>.

Originally committed as revision 21145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 17:27:07 +00:00
Ronald S. Bultje
7e43f74a37 Use getaddrinfo(), if available, in resolve_host(). Patch by Martin
Storsjö <$firstname()$firstname,st>.

Originally committed as revision 21143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 17:14:16 +00:00
David Conrad
2d4970d88d oggdec: Set dts when known
Originally committed as revision 21134 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 05:51:09 +00:00
David Conrad
18ca491bf1 mkvdec: Avoid divide-by-zero crash on invalid real audio tracks
Originally committed as revision 21129 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 00:31:55 +00:00
David Conrad
24ca518bd1 Add support for dirac in ogg
Originally committed as revision 21128 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 00:31:52 +00:00
Carl Eugen Hoyos
e6a9dd6a7d Use enum CodecID where appropriate.
Originally committed as revision 21119 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-10 08:57:20 +00:00
Peter Ross
e6565055b9 Deluxe Paint Animation demuxer
Originally committed as revision 21118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-10 05:47:50 +00:00
Peter Ross
add5badbc1 do not create Electronic Arts audio stream when unsupported revision2 audio codec is present [issue1516]
Originally committed as revision 21116 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-10 05:08:42 +00:00
Peter Ross
8600106ac2 update my email address
Originally committed as revision 21106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-09 03:31:13 +00:00
Ronald S. Bultje
f9664ca026 Use the correct ByteIOContext in extradata parsing.Fixes half of issue
1658.

Originally committed as revision 21095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-08 17:15:46 +00:00
Art Clarke
f2e77e4b1e Improve avformat_version() doxy.
Patch by Art Clarke.

Originally committed as revision 21081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-08 03:43:48 +00:00
Martin Storsjö
b827f4eb47 Currently, the replacement which is used if inet_aton isn't available,
only works correctly on little-endian. The attached patch makes it endian
independent.

Patch by Martin Storsjö <$firstname()$firstname,st>.

Originally committed as revision 21080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-08 00:04:23 +00:00
Ronald S. Bultje
84f0aba18d handler can be NULL if we did not support this dynamic format (codec).
Fixes issue 1658 (the crasher), although the format itself is obviously
still unsupported.

Originally committed as revision 21078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 23:05:19 +00:00
Ronald S. Bultje
8f3c87f3e2 Add correct log context to av_log() calls in parse_rtpmap().
Originally committed as revision 21072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 22:44:03 +00:00
Ronald S. Bultje
c896580087 Re-indent to more closely follow general coding standards used in other
parts of FFmpeg. Also change a starting condition; while (condition) {
... bla = bla->next; } loop into a proper for() loop.

Originally committed as revision 21071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 22:41:14 +00:00
Martin Storsjö
9ea7f03aa0 Always set the destination address even if no port was found.
Patch by Martin Storsjo (martin AT martin DOT st)

Originally committed as revision 21057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 08:24:44 +00:00
Martin Storsjö
c47b0738b5 Check the URL used for the SDP destination.
Patch by Martin Storsjo (martin AT martin DOT st)

Originally committed as revision 21056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 08:11:56 +00:00
Daniel Verkamp
9df9b810c5 Handle more ADPCM codecs in av_get_bits_per_sample().
This removes some special-case code from riff.c.
CODEC_ID_ADPCM_G726 is still handled in riff.c as before because it is
not guaranteed to be fixed 4 bits per sample.

Originally committed as revision 21037 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-06 21:51:20 +00:00
Ben Littler
418a287cae add another mjpeg fourcc to riff.c list
Originally committed as revision 21032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-05 20:14:50 +00:00
Baptiste Coudurier
7b1312fa55 cosmetics, remove useless parentheses, add space
Originally committed as revision 21025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:59:43 +00:00
Baptiste Coudurier
a510991cff simplify error handling in mov_read_default
Originally committed as revision 21024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:58:19 +00:00
Baptiste Coudurier
cb41b2b6e0 remove no more needed MOVAtom.offset field
Originally committed as revision 21023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:51:38 +00:00
Baptiste Coudurier
7ead7e2181 remove useless code skipping data at end of hdlr atom, already done in mov_read_default
Originally committed as revision 21022 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:48:27 +00:00
Ronald S. Bultje
0e59034ed8 Remove forward declarations.
Originally committed as revision 21020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 19:55:43 +00:00
Mike Melanson
2cf9c7ef9c Add support for these widely-used iTunes metadata fields: Album Artist,
Grouping, and Lyrics.

Originally committed as revision 21010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 02:52:40 +00:00
Stefano Sabatini
4160069067 Prefer "*FUNC_NAME(" over "* FUNC_NAME(" for XXX_configuration() and
XXX_license() functions, consistent with the rest of FFmpeg.

Originally committed as revision 21005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-03 14:31:25 +00:00
Stefano Sabatini
aa13b573b4 Use av_match_ext() in place of the deprecated match_ext() function.
Originally committed as revision 21000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-01 23:56:09 +00:00
Stefano Sabatini
8eb631fa50 Deprecate match_ext() in favor of av_match_ext(), and mark it for
deletion at the next major bump.

Originally committed as revision 20998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-01 23:50:10 +00:00
Stefano Sabatini
0f52ef1a00 Use av_guess_format() in place of the deprecated guess_format().
Originally committed as revision 20994 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-01 12:58:03 +00:00
Stefano Sabatini
94b1f33893 Reindent.
Originally committed as revision 20993 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-01 12:52:20 +00:00
Stefano Sabatini
a1f547b94a Deprecate guess_format() in favor of av_guess_format().
Originally committed as revision 20991 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-01 12:46:24 +00:00
Stefano Sabatini
debe86bfed Fix typo.
Originally committed as revision 20990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-01 12:29:22 +00:00
Stefano Sabatini
702d0a9e85 Remove residual use of the doxygen markup which is deprecated,
consistent with r19122.

Originally committed as revision 20989 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-01 12:28:18 +00:00
Stefano Sabatini
f48b0fa29e Document guess_format().
Originally committed as revision 20988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-31 16:38:21 +00:00
Stefano Sabatini
1642ee4337 Deprecate and mark for deletion the function guess_stream_format(),
and clone its code to ffserver_guess_format() in ffserver.c.

guess_stream_format() is hackish since it relies on some undocumented
properties of the name of the muxers (wich is currently only relevant
for the ASF muxer), and has no use outside ffserver.c.

Originally committed as revision 20987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-31 14:12:58 +00:00
Luca Abeni
759dc2b6cc Remove outdated comments.
Originally committed as revision 20983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-30 17:12:29 +00:00
Luca Barbato
d7250724ef Rename internal function
sdp_read_packet -> rtsp_fetch_packet

This way describes slightly better what it does.

Originally committed as revision 20982 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-30 16:19:28 +00:00
Luca Abeni
d3d1eae659 Remove a useless local variable.
Originally committed as revision 20946 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-28 13:41:09 +00:00
Luca Abeni
cd7bfe4079 Remove outdated comment
Originally committed as revision 20945 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-28 13:38:21 +00:00
Luca Abeni
b3fbe02c86 Remove an unneeded local variable.
Originally committed as revision 20944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-28 13:19:54 +00:00
Luca Abeni
6399c17d54 Use different dynamic payload types for audio and video.
Originally committed as revision 20940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-27 21:31:10 +00:00
Kostya Shishkov
8badb23e22 Recognize 16-bit Interplay Video variant
Originally committed as revision 20927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-27 08:21:40 +00:00
Luca Abeni
f877954fd3 Use RTP_PT_PRIVATE in sdp.c instead of hardcoding 96.
Originally committed as revision 20922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-26 10:59:56 +00:00
Diego Biurrun
251822897f Remove some unused variables, fixes the warnings:
libavformat/rtmppkt.c:350: warning: unused variable ‘i’
libavformat/rtmppkt.c:349: warning: unused variable ‘base’

Originally committed as revision 20917 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-24 12:11:55 +00:00
Luca Abeni
76faff6ef2 Add support for mp3 over RTP in rtpdec.c
Originally committed as revision 20916 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-23 21:23:26 +00:00
Michael Niedermayer
2c2a167ca7 It appears that waveformatextensible is mandatory for more cases than
just channels>2. The 16bit case is from MSDN, the 48khz is from less a reliable
www page (sorry i cant find the URL anymore).

Originally committed as revision 20892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-18 06:03:12 +00:00
Reimar Döffinger
4aaab0a328 Add decoder for R210 (uncompressed 10-bit RGB) codec.
Originally committed as revision 20891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-17 18:56:56 +00:00
Michael Tison
a3d995c1eb CD+G demuxer and decoder
Patch by Michael Tison (gmail address: blackspike@....)

Originally committed as revision 20890 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-17 17:25:31 +00:00
Jai Menon
8993535cbb 10l : make sure probe buffer is large enough.
Originally committed as revision 20889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-17 13:05:37 +00:00
Michael Niedermayer
134271c232 Only add 1 index entry per keyframe.
Idea from a patch by samsung.

Originally committed as revision 20888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-16 21:24:04 +00:00
Jai Menon
22ff336145 Parse ID3v[12] metadata from TTA files.
As a side-effect, this commit also fixes issue 1310.

Originally committed as revision 20886 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-16 19:18:48 +00:00
Martin Storsjö
4aaebf78f5 Reply to RTMP ping with the same value as received by client.
Patch by Martin Storsjö ($name at $name dot \163\164)

Originally committed as revision 20881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-16 12:49:38 +00:00
Diego Biurrun
18a49f118c Remove unused variable, fixes the warning:
libavformat/apetag.c:38: warning: unused variable `l'

Originally committed as revision 20878 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-15 23:41:22 +00:00
Benjamin Larsson
8c0c11229e Fix breakage introduced by setting the sample_fmt to SAMPLE_FMT_NONE (r20623). This makes
streaming to ffserver work again.

Originally committed as revision 20869 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 21:08:21 +00:00
Michael Niedermayer
cc38e063be Revert flvdec.c part of r20836
Log:
	Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
	arrays of fixed length.
	Code from ffmbc with changes to adapt to our metadata API.
Reason: memleak & fix is not trivial

Originally committed as revision 20866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 15:59:19 +00:00
Daniel Verkamp
8e9efe4392 FLV 8-bit PCM is unsigned, not signed
Fixes issue #1569

Originally committed as revision 20853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 03:30:25 +00:00
Michael Niedermayer
02483df478 Make sure the Metadata: header is not printed if the only metadata will not
be displayed. (idea from ffmbc)

Originally committed as revision 20850 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 23:39:20 +00:00
Michael Niedermayer
b298daea1a Move dump_metadata() to where it is in ffmbc, looks better.
Originally committed as revision 20849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 23:34:46 +00:00
Michael Niedermayer
229303d16c indent
Originally committed as revision 20848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 23:31:01 +00:00
Michael Niedermayer
4d9b678448 Skip dumping language twice.
This looks too ugly. Idea also from ffmbc.

Originally committed as revision 20847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 23:30:41 +00:00
Michael Niedermayer
2e720e11bc dump metadata for AVStreams & AVPrograms too.
Originally committed as revision 20846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 23:27:43 +00:00
Michael Niedermayer
8b5e5ec5d7 Factorize dump_metadata() out.
Idea from ffmbc, code not, mine is a fraction of the size due to simpler
metadata API.

Originally committed as revision 20845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 23:19:24 +00:00
Michael Niedermayer
cc20679a41 Try to simplify av_estimate_timings_from_pts() like in ffmbc.
Note if this breaks for some file, report it please!

Originally committed as revision 20844 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 22:56:59 +00:00
Alexander Strange
35164ffe50 Correct truncated ID3v1 genre name.
Originally committed as revision 20843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 22:31:29 +00:00
Michael Niedermayer
0e500e0db2 Debug av_log() about stream probing from ffmbc.
Originally committed as revision 20842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 22:15:51 +00:00
Michael Niedermayer
0cd55b0c18 Add CODEC_ID_DNXHD into the 25 fps case.
Merged from ffmbc.

Originally committed as revision 20841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 22:12:20 +00:00
Michael Niedermayer
da457e7086 Simplify code by using av_metadata_set2().
somewhat based on ffmbc

Originally committed as revision 20840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 21:07:47 +00:00
Michael Niedermayer
dfe9ee6b95 More entries for ff_id3v2_metadata_conv from ffmbc.
Originally committed as revision 20839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 21:02:43 +00:00
Michael Niedermayer
8a98be1a08 s/author/artist/ for ID3
from ffmbc

Originally committed as revision 20838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 21:01:49 +00:00
Michael Niedermayer
57f36fda56 More ID3v1 genres from ffmbc.
Originally committed as revision 20837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 20:51:38 +00:00
Michael Niedermayer
12ad66712a Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
arrays of fixed length.
Code from ffmbc with changes to adapt to our metadata API.

Originally committed as revision 20836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 20:27:29 +00:00
Michael Niedermayer
a181981eb4 Add flags to prevent strdup() on arguments to av_metadata_set2().
I cannot use the same ABI as ffmbc as value 2 is already used in ffmpeg,
besides the name AV_METADATA_NONCONST* makes no sense to me.
Add av_metadata_set2() that takes flags.

Originally committed as revision 20834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 20:22:27 +00:00
Michael Niedermayer
17986563eb Get rid of useless casts.
Originally committed as revision 20831 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 17:54:09 +00:00
Michael Niedermayer
005d9b57ad Print extradata in case of failure. I had this in my local tree and it
might be usefull for others ...

Originally committed as revision 20828 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 16:20:00 +00:00
Michael Niedermayer
c3d1532944 APIChanges & minor bump due to avg_frame_rate addition.
Originally committed as revision 20827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 15:55:07 +00:00
Michael Niedermayer
02b398ef49 Add avg_frame_rate.
Originally committed as revision 20826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 15:52:11 +00:00
Carl Eugen Hoyos
a76cf4e197 Use constant CODEC_ID_NONE instead of 0 where appropriate.
Originally committed as revision 20824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 15:28:00 +00:00
Michael Niedermayer
51ce8c2f87 Remove commented out code.
Originally committed as revision 20823 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 15:01:09 +00:00
Kostya Shishkov
0dae3e13e3 Factor out extradata reading code.
Borrowed from RM demuxer in FFmbc.

Originally committed as revision 20821 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 10:07:08 +00:00
Kostya Shishkov
119c61a30f RM audio stream version should be 16-bit followed by header size or reserved
word, so treat it this way instead of extracting different parts from 32-bit
value.

Originally committed as revision 20820 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 09:08:58 +00:00
Kostya Shishkov
461ef74116 Make RM demuxer look more like proper demuxer by introducing codec tags
instead of many strcmp() on always four-byte strings.
Idea borrowed from RM demuxer in FFmbc by Baptiste Coudurier.

Originally committed as revision 20819 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 08:51:27 +00:00
Kostya Shishkov
851ef8755b Factor out variable declaration
Originally committed as revision 20818 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 08:44:06 +00:00
David Conrad
5e15c7d95b Fix PTS for OGM codecs.
Fixes issue251

Originally committed as revision 20815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 20:18:43 +00:00
John Stebbins
106fa129f4 Reset pts_buffers in av_read_frame_flush().
Patch by John Stebbins, jstebbins jetheaddev com

Originally committed as revision 20806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 15:26:33 +00:00
Kostya Shishkov
cfac91fec3 Dump RTMP packet contents in debug mode
Originally committed as revision 20799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-11 17:13:35 +00:00
Martin Storsjö
f8caa5441b 5l trocadero: don't forget to free packet in gen_connect()
Patch by Martin Storsjö ($name at $name dot `abbreviation for "street"`)

Originally committed as revision 20798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-11 15:31:58 +00:00
Martin Storsjö
72b870b95b Do not try to interact with RTMP server after "stop" command was received.
Patch by Martin Storsjö ($name at $name dot `Sao Tome and Principe domain`)

Originally committed as revision 20797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-11 11:37:21 +00:00
Carl Eugen Hoyos
ab176fdffb (Partly) support Metasoft MJPEG Codec, fixes half of issue 1611.
Originally committed as revision 20796 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-10 23:06:23 +00:00
Carl Eugen Hoyos
f63e5a7410 Support Etymonix MPEG-2 video codec, fixes issue 1603.
Originally committed as revision 20795 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-10 22:38:49 +00:00
Ben Littler
4bae225126 add dvcs to dvvideo, fixes issue 1604
Originally committed as revision 20786 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-09 20:55:47 +00:00
Carl Eugen Hoyos
4b86926b95 Support AVI1 and AVI2 in avi as MJPEG.
Fixes issue 1602.

Originally committed as revision 20781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-08 23:47:45 +00:00
Michael Niedermayer
b68a7679f9 Raise threshold of h263 probe by 1 to avoid misdetection.
Fixes issue 1588.

Originally committed as revision 20765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-08 12:34:08 +00:00
Michael Niedermayer
f76eef99a2 Add out commented av_log to debug h263_probe.
Originally committed as revision 20764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-08 12:33:00 +00:00
Michael Niedermayer
6de5b62790 Also print the number of invalid packets in the debug output.
Originally committed as revision 20763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-08 12:24:41 +00:00
Michael Niedermayer
55f6524789 Flip the comparission direction of vid+audio+priv1 and pspack, it appears to have
been wrong.
Fixes issue1571.

Originally committed as revision 20762 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-08 12:19:30 +00:00
Jai Menon
4da715cb24 AU : demuxed packet size should be sample size aligned.
Fixes issue 1593.

Originally committed as revision 20758 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-07 13:55:38 +00:00
Kostya Shishkov
e07c92e4bb cosmetics: insert space between codeword and left parenthesis
Originally committed as revision 20746 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-06 07:03:46 +00:00
Sergiy
615c287990 Do not send invokes to RTMP server if we are not connected to it.
Patch by Sergiy (server.connect("gmail.com").selectAddress("piratfm"))

Originally committed as revision 20745 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-06 07:01:37 +00:00
Sean Soria
b593f7fdef Calls to url_fseek should have their return value checked in
av_seek_frame_binary, just as they do in av_seek_frame_generic.
Otherwise, function may return success even though url_fseek reported
failure.

Patch by Sean Soria, first.last at gmail

Originally committed as revision 20744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-06 00:03:53 +00:00
Kostya Shishkov
c72406112f cosmetics: reindent after last commit
Originally committed as revision 20732 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-04 16:52:42 +00:00
Sergiy
6bf22e18d1 Implement RTMP output (publishing FLV stream to RTMP server).
Patch by Sergiy (piratfm at `do-no-evil-mail`.com)

Originally committed as revision 20731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-04 16:52:16 +00:00
Sergiy
84a29dc10a Compress headers for output RTMP packets.
Patch by Sergiy (piratfmGMAIL)

Originally committed as revision 20728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-04 15:01:58 +00:00
Kostya Shishkov
2784ede40a Remove duplicating variable
Originally committed as revision 20718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-03 17:11:48 +00:00
Kostya Shishkov
6a63e83afc 5l trocadero: RTMP channel ID lies in range 3-65599, uint8_t is too small for it
Originally committed as revision 20717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-03 16:13:51 +00:00
Sergiy
31da596634 Send connect() and createStream() in RTMP system channel, not video channel.
Patch by Sergiy (com gmail . piratfm @ mail =)

Originally committed as revision 20716 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-03 15:59:51 +00:00
Sergiy
5e9ad75985 Move "app" string into RTMP protocol context.
Patch by Sergiy (com.gmail@piratfm)

Originally committed as revision 20715 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-03 15:47:00 +00:00
Sergiy
a352b60594 RTMP packets with one-byte header use previous packet timestamp difference, so
track timestamp difference as well.
Patch by Sergiy (mail.composeAddress("piratfm","gmail.com"))

Originally committed as revision 20714 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-03 06:40:37 +00:00
Ramiro Polla
7c3c53c851 Update Changelog, documentation, and libavformat minor version number for
"A format generated by IndigoVision 8000 video server" added in r20681.

Originally committed as revision 20712 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-03 00:27:01 +00:00
Sergiy
9e69ab1864 Add another known RTMP channel ID to enum.
From patch by Sergiy (mail = piratfm, gmail)

Originally committed as revision 20703 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-02 13:00:28 +00:00
Sergiy
b316991bb6 Move is_input flag into RTMP protocol context.
Patch by Sergiy (gmail(piratfm))
Thread "[PATCH] rtmp-output"

Originally committed as revision 20702 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-02 12:55:10 +00:00
Baptiste Coudurier
77df894aed print error message when image2 muxer fail to compute frame filename
Originally committed as revision 20694 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-01 23:10:32 +00:00
Sean Soria
6659b32ab2 Change ret type to int64_t because url_fseek returns int64_t.
This fixes seeking in files > 2gb.
Patch by Sean Soria, sean dot soria at gmail dot com.

Originally committed as revision 20693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-01 22:56:44 +00:00
Baptiste Coudurier
66765b5933 use AVFormatContext in av_log, better than AVCodecContext when multiple streams are present
Originally committed as revision 20689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-01 20:15:05 +00:00
Kostya Shishkov
817d967d96 Write timestamp deltas, not timestamps, for RTMP packets with partial header
Originally committed as revision 20686 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-01 16:43:53 +00:00
Kostya Shishkov
e6b244a3b9 Full-header RTMP packets contain real timestamp, others contain timestamp
difference, so make all read packets store absolute timestamp.
As a consequence, we don't need to track audio/video timestamps separately
any longer in protocol handler.

Originally committed as revision 20685 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-01 16:08:44 +00:00
Kostya Shishkov
b1eb53ab59 Write header for RTMP packets with channel_id >= 64 correctly
Originally committed as revision 20684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-01 15:13:23 +00:00
Sergiy
59b6482a04 Read and write extended timestamps for RTMP packets.
Extracted from patch by Sergiy in thread "[PATCH] rtmp-output"

Originally committed as revision 20683 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-01 15:07:32 +00:00
Kostya Shishkov
1ab21f1980 7l trocadero: reading right into enum variable may cause unwanted effects, use
intermediate buffer for reading value instead in RTMP protocol handler.

Originally committed as revision 20682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-01 14:58:17 +00:00
Michael Niedermayer
00b6fa40c3 Support "A format generated by IndigoVision 8000 video server".
Originally committed as revision 20681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-01 13:17:10 +00:00
Michael Niedermayer
483aad717e slif aka "SoftLab MPEG-2 I-frames Codec" support.
Flipping one bit still is popular it seems as a means to create a new codec.
fixes issue1469.

Originally committed as revision 20679 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-01 02:07:46 +00:00
Michael Niedermayer
77ac76a30f Print a warning if the duration is estimated from the bitrate, as this is
likely not accurate.

Originally committed as revision 20675 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-30 22:08:22 +00:00
Vitor Sessak
cea65433e0 decode qcelp in aiff, implement #1524, patch by Vitor
Originally committed as revision 20674 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-30 22:01:21 +00:00
Baptiste Coudurier
1bd26e51f3 100l, max value for timescale is UINT16_MAX
Originally committed as revision 20661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 18:26:51 +00:00
Baptiste Coudurier
729ef3ba62 remove useless mov timescale field
Originally committed as revision 20652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:46:49 +00:00
Baptiste Coudurier
74ccc66099 change track timescale to unsigned int, fix warning
Originally committed as revision 20651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:41:48 +00:00
Baptiste Coudurier
7506e117db track time can be 64bit
Originally committed as revision 20650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:40:27 +00:00
Baptiste Coudurier
7c4b7d0f41 support pcm_f32/64le in mov
Originally committed as revision 20649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:27:08 +00:00
Baptiste Coudurier
ba7c0ece61 cosmetics, reindent after last commit
Originally committed as revision 20648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:04:44 +00:00
Baptiste Coudurier
feaa8d110d support sample rates > INT16_MAX in mov using stsd v2
Originally committed as revision 20647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:03:24 +00:00
Jai Menon
6866dd1237 Fix typo.
Originally committed as revision 20628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-27 13:10:56 +00:00
Reimar Döffinger
7c7d3abf3c 10l, pix_fmt should be set by the motionpixels decoder, not by the demuxer.
This fixes playback when lavf and lavc are less tightly couples as in e.g. MPlayer.

Originally committed as revision 20626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-26 21:15:06 +00:00
Jason Garrett-Glaser
d2b34efe22 Update ffserver to include all basic x264 parameters in .ffm files.
Originally committed as revision 20601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-24 15:54:17 +00:00
Peter Ross
c351524c9e Determine VOC block length when length field is zero, fixes issue1538.
Originally committed as revision 20596 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-24 07:08:17 +00:00
David Conrad
b9c78bca26 MOV: cprt is another tag used for copyright
Originally committed as revision 20587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-23 08:47:47 +00:00
David Conrad
7382902b86 MOV: Add several iTunes metadata tags
Originally committed as revision 20586 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-23 08:47:44 +00:00
David Conrad
620af1a17a MOV: Fix writing \251wrt metadata (r20453 only fixed the demuxer)
Originally committed as revision 20585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-23 08:47:40 +00:00
Baptiste Coudurier
9c5a9e6b48 set mp3 timebase to the lcm of all mp3 sample rates to fix frame duration
Originally committed as revision 20579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-22 21:04:18 +00:00
Justin Ruggles
c3988a59ce Add MP4 object type for ALS.
Originally committed as revision 20578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-22 18:13:22 +00:00
Kostya Shishkov
87ca1b8f7f When searching for AMF object field value, try to find that object first
instead of assuming it should occur right at given position.
This helps finding human-readable error descriptions in RTMP server replies.

Originally committed as revision 20575 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-22 09:03:06 +00:00
Kostya Shishkov
fe52395878 Print error when RTMP protocol can't open connection
Originally committed as revision 20574 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-22 08:42:55 +00:00
Kostya Shishkov
afbacb931b Pass only useful FLV metadata from RTMP stream
Originally committed as revision 20573 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-22 08:40:55 +00:00
Justin Ruggles
aca857ecd3 Do not write an extra byte in the iTunes 'hdlr' tag. The files on iTMS have an
extra byte and are not compliant with ISO 14496-12.  This causes some strict
demuxers (notably the MPEG-4 ALS reference software) to fail.  It has been
confirmed that not writing the extra byte will still allow the generated MP4
files to work with QuickTime/iTunes/iPod.

Originally committed as revision 20571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-22 02:07:10 +00:00
Reimar Döffinger
c7a38887c1 Do D10 AES3 audio conversion in-place instead of using a large on-stack buffer.
Originally committed as revision 20567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-20 23:12:55 +00:00
Daniel Verkamp
1b88277bd9 FLV muxer support for Flash screen codec v2
Originally committed as revision 20564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-20 20:02:49 +00:00
Daniel Verkamp
0aa6a518ad Add codec id for Flash screen codec v2 and hook it up in FLV demuxer
Originally committed as revision 20563 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-20 19:16:42 +00:00
Baptiste Coudurier
e26df9ebf1 use AVFormatContext in dprintf
Originally committed as revision 20554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-19 21:03:25 +00:00
Diego Biurrun
c173693698 Add functions to return library license and library configuration.
Originally committed as revision 20547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-18 17:15:17 +00:00
Baptiste Coudurier
adeb907137 Search relative path according to alias record when opening mov reference files.
Based on patch by Maksym Veremeyenko, verem at m1stereo dot tv

Originally committed as revision 20539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-15 03:26:47 +00:00
Luca Abeni
103dfbe2c4 Add some "#if"s to avoid compiling the RTSP code when the RTSP demuxer
is disabled, and remove a useless "#if CONFIG_SDP_DEMUXER"

Originally committed as revision 20530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-13 10:19:42 +00:00
Stefano Sabatini
1d8041b36c Split overly long line in doxy.
Originally committed as revision 20529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-12 23:05:56 +00:00
Luca Abeni
987131828c Split the sdp_read_packet() function out of rtsp_read_packet().
This allows to avoid compiling RTSP code when not needed.

Originally committed as revision 20526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-12 15:34:17 +00:00
Luca Abeni
1ced9da357 Move some some functions around, so that splitting the SDP code out of
rtsp_read_packet() is simpler.

Originally committed as revision 20525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-12 10:31:37 +00:00
Alex Converse
ba278391ba Debug print MP4 objectTypeIndication in hex not decimal as values are listed in
hex in all official documents.

Originally committed as revision 20523 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-12 02:22:19 +00:00
Diego Biurrun
ca02d8ec97 Add '#undef fprintf' before PRINT macro that uses fprintf.
Otherwise there may be trouble when fprintf is disabled in favor of av_log.

Originally committed as revision 20515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-11 21:57:50 +00:00
Alex Converse
5aea268d14 Add a channels field to MPEG4AudioConfig.
Originally committed as revision 20512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-11 20:24:23 +00:00
Carl Eugen Hoyos
66ddc150f0 Increase default value for max_analyze_duration, fixes issue 1506, a regression.
Originally committed as revision 20483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-09 01:10:55 +00:00
Carl Eugen Hoyos
0f87b77176 Use enum instead of integer types where appropriate.
Originally committed as revision 20482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-08 23:48:15 +00:00
Carl Eugen Hoyos
80454494de Use CODEC_ID_NONE instead of 0 for enum CodecID.
Originally committed as revision 20481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-08 23:46:32 +00:00
Baptiste Coudurier
609d864611 move code to avoid forward declaration
Originally committed as revision 20475 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-08 03:27:58 +00:00
Baptiste Coudurier
b3f9f7a333 Let pmt override stream info when encoutered later in the ts file.
Do not set codec id based on pes start code, this is unreliable.
Fix gazeta-20090408-1456-aa.ts

Originally committed as revision 20474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-08 03:17:08 +00:00
Carl Eugen Hoyos
28f008a9d3 Support some LATM AAC streams (they can be decoded with MPlayer).
Originally committed as revision 20472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-07 23:44:56 +00:00
Justin Ruggles
1a15ab4920 Do not set AVCodecContext.sample_fmt in the TMV and SoX demuxers.
Originally committed as revision 20471 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-07 22:35:00 +00:00
Baptiste Coudurier
a4cb56aaf4 change \0xa9enc tag metadata name to encoder to match id3v2
Originally committed as revision 20469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-06 18:59:25 +00:00
Kostya Shishkov
0d32307dd2 10l: WavPack demuxer forgot to seek back to initial position after block
contents parsing (for custom sampling rate).

Originally committed as revision 20468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-06 18:25:45 +00:00
Gordon Irlam
9cad7e2193 Fix a typo in rtp_h264.c:parse_h264_sdp_line(). Patch by Gordon Irlam
(gordonipub2 AT gordoni DOT com).

This fixes H.264 over RTP when the SDP contains a "framesize:" attribute
(for example, rtsp://video3.americafree.tv/AFTVCartoonsH264250.sdp )

Originally committed as revision 20463 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 14:25:37 +00:00
Baptiste Coudurier
bddc2df52e 10l, typo
Originally committed as revision 20462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 08:53:05 +00:00
Kostya Shishkov
7aa2d42db6 If custom sampling rate is set in WavPack file, parse first block to find
actual value.

This fixes issue 1518.

Originally committed as revision 20461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 08:14:48 +00:00
Kostya Shishkov
aa926a480f Initialize block_parsed before reading first block header in WavPack demuxer,
it will be useful later.

Originally committed as revision 20460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 08:10:50 +00:00
Baptiste Coudurier
c2564699bf do not redundantly set stream nb_frames, it's already set in read_stts
Originally committed as revision 20459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 07:32:50 +00:00
Baptiste Coudurier
e745272196 compute dts shift with ctts value, cslg atom might be missing, fix #419
Originally committed as revision 20458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 07:30:53 +00:00
Baptiste Coudurier
fedb1eca07 check that duration is set to avoid fpe
Originally committed as revision 20457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 07:17:10 +00:00
Baptiste Coudurier
507330b9d3 warn if stream timescale is not set and set it to 1 to avoid FPE
Originally committed as revision 20456 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 07:11:54 +00:00
Reynaldo H. Verdejo Pinochet
87e76ae0bd Corrects two typos
Originally committed as revision 20455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 02:04:21 +00:00
Reynaldo H. Verdejo Pinochet
a8e1cbaf18 Decrement probe score at unsuported bpp
Originally committed as revision 20454 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 01:59:07 +00:00
Baptiste Coudurier
55d2e32a40 fix \0xa9wrt metadata, to composer, fix issue #1501
Originally committed as revision 20453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 01:40:13 +00:00
Andrew Wason
42022e0362 add yuvs fourcc to raw.c and isom.c, fixes samples/mov/yuvs.mov
patch by Andrew Wason

Originally committed as revision 20439 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-03 16:17:21 +00:00
Ben Littler
e47ca4f798 map VYUY fourcc to rawcodec
fixes http://samples.mplayerhq.hu/V-codecs/ATI-VCR12/ATI/y422test.avi

Originally committed as revision 20432 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-02 00:10:10 +00:00
Justin Ruggles
dee34af4d6 Set the sample format for Smacker audio in the decoder rather than in the
demuxer.

Originally committed as revision 20429 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-01 15:08:49 +00:00
Baptiste Coudurier
050ba6f45e print packet duration when debugging timestamps
Originally committed as revision 20420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-30 18:17:16 +00:00
Francesco Lavra
e58992e41f Support demuxing teletext in DVB streams.
Original patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 20414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-29 10:46:16 +00:00
Ben Littler
13547dd11f add 2vuy fourcc to riff.c , fixes samples/V-codecs/2vuy.avi
Originally committed as revision 20383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-27 17:37:41 +00:00
Ben Littler
9853bbb21a add some raw codec fourccs, fixes:
samples/V-codecs/

P422.AVI
UYNV.AVI
UYNY.AVI
V422.AVI
YUNV.AVI

Originally committed as revision 20379 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-27 15:57:28 +00:00
Luca Barbato
7549632bda rtsp_close_streams frees the auth_b64 line already
Originally committed as revision 20370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-25 00:41:10 +00:00
Luca Barbato
d243ba30b8 Support 3xx redirection in rtsp
All the error codes 3xx got managed the same way.
After setup/early play redirection will not be managed
REDIRECT method is yet to be supported (if somebody knows a server implementing
it please contact me)

Originally committed as revision 20369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-25 00:06:31 +00:00
haim alon
c5898e8623 compute codec bitrate in mov demuxer, patch by haim alon, haim dot alter at gmail dot com
Originally committed as revision 20368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-24 20:40:00 +00:00
Luca Barbato
921da21745 Just remove params understood by the demuxer
This should unbreak certain urls.

Originally committed as revision 20364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-24 16:53:06 +00:00
Luca Barbato
7541f32edd Suppress ?params in the rtsp uri
Right now rtsp demuxer receives it's ffmpeg specific params encoded in the url
That made the server receiving requests with the url ending with "?udp",
"?multicast" and "?tcp". That may or may not cause problems to servers with
overly strict or overly simple uri parsers

Patch from Armand Bendanan (name.surnameATfreeDOTfr)

Originally committed as revision 20363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-24 15:18:21 +00:00
Luca Barbato
224b44957b Use sdp c= line if the rtsp Transport line doesn't have a destination
Transport:destination in rtsp is optional, c= line in sdp is compulsory

Patch from Armand Bendanan (name.surnameATfreeDOTfr)

Originally committed as revision 20362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-24 15:10:58 +00:00
Diego Biurrun
76e6e9c330 Remove ancient redir demuxer.
HTTP supports redirection just fine without it.

Originally committed as revision 20361 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-24 12:44:27 +00:00
Michael Niedermayer
df84d7d9bd Fix infinite loop with size==0 && sample_size!=0 in non interleaved avis.
Untested, i do not have a sample.

Originally committed as revision 20348 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-22 18:43:08 +00:00
Michael Niedermayer
83a4d356ef Support non interleaved avi files that have 0<size<sample_size.
(No i do not have a sample its thus also untested)
The new code is also simpler.

Originally committed as revision 20347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-22 18:32:27 +00:00
Samuli Valo
c671ac40f5 Fixes detection and error reporting of non-existing files in img2.c.
Patch by Samuli Valo: name surname picturall com

Originally committed as revision 20346 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-22 16:27:01 +00:00
Ramiro Polla
a3faf694a2 Add comment on #endif about condition that triggers it.
Originally committed as revision 20337 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-21 01:25:39 +00:00
Daniel Verkamp
61ee504517 Seek function for TMV
Originally committed as revision 20336 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-20 19:27:25 +00:00
Daniel Verkamp
0319ba5e12 Parenthesize correctly in TMV probe
Originally committed as revision 20335 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-20 19:07:08 +00:00
tralph11@yahoo.com
711e69a730 Improve sofdec dectection to avoid false positives for MP2.
Patch by tralph11, tralph11 yahoo

Originally committed as revision 20333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-20 15:27:05 +00:00
Benoit Fouet
08580cb05a Make url_resetbuf() assert on wrong flags passed and make it static on next
version bump.
See thread: [FFmpeg-devel] & vs. &&
Date: Mon, 12 Oct 2009 14:21:06 +0200

Originally committed as revision 20330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-20 06:40:01 +00:00
Diego Biurrun
0cd0a22488 Move function that is only used by the MP3 muxer below the corresponding #if.
This removes the dependency of the MP2 muxer on the id3v2 object file.

Originally committed as revision 20329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 23:22:23 +00:00
Diego Biurrun
ff06d76acd Add '#include "libavutil/intreadwrite.h"', necessary for AV_RB32.
This fixes the build with demuxers disabled.

Originally committed as revision 20327 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 22:36:57 +00:00
Diego Biurrun
cd69fa69c5 The MP2/MP3 muxer uses ff_id3v2_tags, so add the correct object dependency.
Originally committed as revision 20326 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 22:32:32 +00:00
Diego Biurrun
6f571d89c1 Remove some duplicate object dependencies for the RTSP demuxer.
They are already covered by its dependency on the SDP demuxer.

Originally committed as revision 20324 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 22:10:15 +00:00
Diego Biurrun
47e9f6217d Add missing rdt.o dependency for SDP demuxer.
This fixes the build when the RTSP demuxer is disabled.

Originally committed as revision 20323 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 22:03:02 +00:00
Baptiste Coudurier
72017ea1dc check stream index validity in av_program_add_stream_index
Originally committed as revision 20319 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 18:55:27 +00:00
Baptiste Coudurier
8425cecacc request mp3 frame_size to be set in has_codec_parameters, fix issue #1314
Originally committed as revision 20318 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 18:53:32 +00:00
Baptiste Coudurier
f2c061ec0f reindent after commit
Originally committed as revision 20307 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 02:20:08 +00:00
Baptiste Coudurier
7edbcfb79e In dump_format, print streams not associated with any program.
Fixes issue #1366.

Originally committed as revision 20306 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 02:12:10 +00:00
Reynaldo H. Verdejo Pinochet
cbd8a722bb Fix wrong comparison in r20304
Originally committed as revision 20305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 01:42:05 +00:00
Reynaldo H. Verdejo Pinochet
9cf6bbb993 If missing, calculate width or height from bpp and
image size lowering the probe score too.

Originally committed as revision 20304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 23:56:00 +00:00
Baptiste Coudurier
c3a58c4efc fix indentation
Originally committed as revision 20300 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 23:27:23 +00:00
Carl Eugen Hoyos
94ec3aca56 Support FourCC mjpa as MJPEG.
Fixes issue 1492.

Originally committed as revision 20296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 22:43:19 +00:00
Baptiste Coudurier
807e4e81a8 mux all stream types except audio as one pes packet per avpacket, issue #1374
Originally committed as revision 20292 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 21:41:03 +00:00
Baptiste Coudurier
7857d3ccf6 fix indentation and add braces
Originally committed as revision 20289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 20:25:48 +00:00
Baptiste Coudurier
45a49840f3 handle_packets takes number of packets as arg, avoid reading too much
Originally committed as revision 20288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 20:11:32 +00:00
Baptiste Coudurier
1303d62d84 Increase max resync size, fix demuxing of dvgrab-2009.03.28_19-07-22.m2t
Print error when max resync size is reached and return EAGAIN instead of
INVALIDDATA, so user can retry if wanted.

Originally committed as revision 20286 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 20:08:13 +00:00
Reynaldo H. Verdejo Pinochet
f122ef36b1 Smarten mtv's probe a bit. Check for non zero
on bpp and width|height header fields. This
change is among the ones suggested by Vitor
Sessak in his '[FFmpeg-devel] [PATCH] Improve
MTV probe' thread.

Originally committed as revision 20283 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 18:02:12 +00:00
Aurelien Jacobs
8da1d52cc1 remove old and useless debug code
It uses the old, deprecated metadata API and prints exactly the same thing
as what ffmpeg/ffplay does.

Originally committed as revision 20280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 16:13:29 +00:00
Anton Khirnov
c4d438c265 Read metadata in WavPack files.
Patch by Anton Khirnov (acronym("What You Should Know About Something"), gmail)

Originally committed as revision 20279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 15:28:53 +00:00
Anton Khirnov
2bd0758efa matroskaenc: Add support for writing chapters.
patch by Anton Khirnov  wyskas _at_ gmail _dot_ com

Originally committed as revision 20277 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 12:17:01 +00:00
Diego Biurrun
15674f12be cosmetics: Break overly long lines.
Originally committed as revision 20276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 10:47:40 +00:00
Kostya Shishkov
5d660598b0 Support more than 64 channels in RTMP input
Originally committed as revision 20270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 07:01:06 +00:00
Kostya Shishkov
8f648b74c3 Accept RTMP packets with one-byte header
Originally committed as revision 20269 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 06:58:00 +00:00
Kostya Shishkov
f836fa1706 Last parameter in RTMP "play" call was optional and some servers seem not to
understand it, so drop it.

Originally committed as revision 20268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 06:54:04 +00:00
Justin Ruggles
961057decd Remove unnecessary entries in ff_vorbiscomment_metadata_conv. VorbisComment
keys are case-insensitive.

Originally committed as revision 20267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-17 21:30:50 +00:00
Vitor Sessak
a4cb675124 Avoid segfault for empty input files
Originally committed as revision 20265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-17 20:37:58 +00:00
Måns Rullgård
cf671d0543 Remove extraneous const keyword
Originally committed as revision 20263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-17 14:07:28 +00:00
Luca Abeni
56e6f8309e Emit the SDP lines in the correct order
Originally committed as revision 20262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-17 11:15:45 +00:00
Carl Eugen Hoyos
bc2d2a07d5 Make AVCodecTag.id enum CodecID and use CODEC_ID_NONE instead of 0.
Originally committed as revision 20250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-16 14:46:06 +00:00
Justin Ruggles
68677dd8ed Log a clearer warning message when muxing FLV with Speex containing more than
8 frames per packet.

Originally committed as revision 20247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-16 10:04:35 +00:00
Reimar Döffinger
c76911bd65 Split parts of dvdata.h into dvdata.c, this ensures that things like
work_chunks_* and dv_idct_factor_* variables appear only once in the binary
instead of 3 times.
Saves 3264 bytes in .rodata and 312416 bytes in .bss on x86_64.

Originally committed as revision 20246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-16 07:55:57 +00:00
Justin Ruggles
046c400103 Add Speex support to the FLV muxer.
Originally committed as revision 20245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-16 03:02:25 +00:00
Jai Menon
2e3ca1ffd0 Skip padding bytes correctly in ID3 tags.
This fixes a regression introduced in r20170.

Originally committed as revision 20238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-15 13:55:19 +00:00
Justin Ruggles
0fa0fa296a 10l: update Makefile after rename
Originally committed as revision 20236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-15 09:49:06 +00:00
Justin Ruggles
5855e4e0dd Rename aiff.c to aiffdec.c
Originally committed as revision 20235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-15 09:46:56 +00:00
Justin Ruggles
47b47bbdaf Split up the AIFF muxer and demuxer into separate files.
Originally committed as revision 20234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-15 09:45:16 +00:00
Reimar Döffinger
d8b35b8586 Add decoder for "forward uncompressed".
Fixes issue 1467.

Originally committed as revision 20226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-13 18:15:57 +00:00
Reimar Döffinger
1e69999334 MXF: simply ignore tracks that are invalid due to not having a valid Sequence
part instead of failing completely.
This partly fixes issue 1470 (broken files created by BBC ingex recorder).

Originally committed as revision 20221 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-13 08:08:10 +00:00
Justin Ruggles
8746296818 Add Speex support to the Ogg muxer.
Originally committed as revision 20220 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-13 01:46:19 +00:00
Justin Ruggles
24c6f152c4 Do not read data past the end of the SSND chunk in the AIFF demuxer.
Fixes Issue 1455.

Originally committed as revision 20219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-13 00:19:34 +00:00
Carl Eugen Hoyos
dd9d5a1ef8 Support Midvid JPEG Video Codec (still flipped).
Originally committed as revision 20218 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-12 22:00:14 +00:00
Carl Eugen Hoyos
54089ecd5a Support Intel JPEG Library Video Codec (still flipped).
Originally committed as revision 20217 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-12 21:35:26 +00:00
Justin Ruggles
15299b3821 Calculate correct packet durations when demuxing Ogg/Speex. This involves
determining if there is any delay in the first packet and/or any truncation in
the final packet.

Originally committed as revision 20216 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-12 21:30:03 +00:00
Reimar Döffinger
90aa6ace63 Merge declaration and initialization
Originally committed as revision 20214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-12 16:38:08 +00:00
Reimar Döffinger
098d8e0950 Simplify: use FFMIN
Originally committed as revision 20213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-12 16:36:48 +00:00
Daniel G. Taylor
febd1c90a6 Detect Windows Media DRM protected files and display warning if no key
was provided.

Patch by Daniel G. Taylor, dan programmer-art org

Originally committed as revision 20209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-11 23:09:33 +00:00
Carl Eugen Hoyos
b8c0db9981 Allow autodetection of E-AC3.
Originally committed as revision 20206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-11 11:56:53 +00:00
Carl Eugen Hoyos
0096d766b9 Allow demuxing of E-AC3 (stream type 0x84) in MPEG-TS.
Originally committed as revision 20200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-10 21:17:52 +00:00
Daniel Verkamp
54eb4ae0a2 Do not allow 0 sample rate in TMV demuxer
Originally committed as revision 20195 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-09 18:29:19 +00:00
Daniel Verkamp
f19ae9ea4d Stricter TMV probe
Originally committed as revision 20194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-09 18:24:47 +00:00
Daniel Verkamp
70d8c762d9 Reindent
Originally committed as revision 20182 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-06 17:51:28 +00:00
Daniel Verkamp
811e0fc2e8 Add RF64 support to wav demuxer.
Originally committed as revision 20181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-06 17:50:10 +00:00
Anton Khirnov
7fd5aeb3e5 Only read ID3v1 tag if ID3v2 isn't present or is empty.
This prevents the demuxer from exporting multiple semantically identical but
differently named tags.

Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 20175 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-05 21:36:56 +00:00
Anton Khirnov
41770abf86 id3v2: Export all text information frames with correct names.
Patch by Anton Khirnov <wyskas at gmail dot com>

Originally committed as revision 20171 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-05 20:10:07 +00:00
Anton Khirnov
078d89a2b0 MP3 muxer: Write all metadata.
Patch by Anton Khirnov <wyskas at gmail dot com>

Originally committed as revision 20170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-05 16:06:00 +00:00
Daniel Verkamp
79c0790789 Fix pcm_read_seek () when the position it calculates is greater than 2 GB.
pcm_read_seek() puts the return value of url_fseek() in an int and then
compares < 0 to see if an error occurred; if the position is greater
than 2 GB, the 32-bit signed int result will be < 0.

Change the type of ret to int64_t to avoid the wraparound.

patch by Daniel Verkamp, daniel drv nu

Originally committed as revision 20169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-05 09:19:42 +00:00
Ian Caulfield
63380b5e54 Allow the combined TrueHD/AC3 tracks on Blu-Ray discs to be demuxed as two separate streams.
Patch by Ian Caulfield, ian D caulfield A gmail

Originally committed as revision 20168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-05 08:38:39 +00:00
Carl Eugen Hoyos
e18027ac40 Add FIXME about low_delay vs has_b_frames.
Originally committed as revision 20161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-03 19:40:52 +00:00
Wallak
f4a4be3f4e H264 allows B frames without requiring a >=1 sized buffer.
Patch by wallak, wallak free fr

Originally committed as revision 20160 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-03 19:30:09 +00:00
Reimar Döffinger
3fcb5113c6 wav demuxer: return AVERROR_EOF instead of AVERROR(EIO) when the end of
the file is reached normally, without any error.

Originally committed as revision 20143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 07:27:08 +00:00
Reimar Döffinger
e581b6288f wav: return av_get_packet errors unchanged.
Originally committed as revision 20142 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 07:22:44 +00:00
Reimar Döffinger
fbc6630168 Remove url_feof check that would be triggered only after incorrectly producing
an empty packet and also av_get_packet already handles EOF now.

Originally committed as revision 20140 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 07:05:52 +00:00
Reimar Döffinger
8a62a378de Remove useless setting of pkt->size, av_get_packet already handles that.
Originally committed as revision 20139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 07:03:04 +00:00
Reimar Döffinger
a7a9dd0eb6 Return special EOF checking for aiff and au demuxers, the check was at
the wrong place, causing an empty packet to be read before EOF was
detected and the eof detection is already now handled by av_get_packet anyway.

Originally committed as revision 20138 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 06:42:20 +00:00
Reimar Döffinger
c3db0bc61d Return any error return values from av_get_packet, get_buffer etc. unchanged
in the raw demuxers.
Also remove special handling of 0-size reads, if they are due to an error/eof,
these are already converted to the appropriate error by get_buffer.

Originally committed as revision 20137 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 06:40:50 +00:00
Reimar Döffinger
7f7686dfb1 Make get_buffer and get_partial_buffer return url_ferror or AVERROR_EOF as
appropriate if it couldn't read any data at all.
This should make handling of EOF and error simpler or make it work right without
extra code in a few place (e.g. raw demuxer).

Originally committed as revision 20135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 06:36:39 +00:00
Aurelien Jacobs
553e9f7529 matroskadec: cosmetics: indentation
Originally committed as revision 20133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 21:15:36 +00:00
Aurelien Jacobs
ff0d5a745e matroskadec: don't overwrite extradata already read by ff_get_wav_header()
Originally committed as revision 20132 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 21:14:46 +00:00
Aurelien Jacobs
038146e9cf matroskadec: fix handling of A_MS/ACM track with no extradata
Originally committed as revision 20131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 21:14:05 +00:00
Reimar Döffinger
22a7e19b50 Make rawvideo_read_packet return partial frames.
This is consistent with other demuxers and also fixes a memleak (memory
allocated for partial frame data was leaked).

Originally committed as revision 20130 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 17:32:22 +00:00
Reimar Döffinger
8cb724c5c4 Simplify: remove pointless {} and else
Originally committed as revision 20129 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 17:26:20 +00:00
Reimar Döffinger
d4c1803e0e Remove pointless setting of pkt->size, av_get_packet already handles this.
Originally committed as revision 20128 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 17:22:01 +00:00
Reimar Döffinger
b46c98bf66 au demuxer: pass av_get_packet error on unchanged instead of converting to
AVERROR(EIO).

Originally committed as revision 20127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 17:08:33 +00:00
Reimar Döffinger
c67031e7cf av_new_packet failing should return ENOMEM, not EIO.
Originally committed as revision 20126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 16:10:09 +00:00
Reimar Döffinger
43d7c6118d put_bits can only reliably write up to 31 bit bits, above it relies on
undefined shift behaviour.
Document this, fix the assert and add a put_bits32 to handle writing 32
bits and use that where necessary.

Originally committed as revision 20124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 15:40:29 +00:00
Aurelien Jacobs
e471e3c4a5 Fix playback of strange AVI files with stray LIST.
sample: http://samples.mplayerhq.hu/avi/AV36_1.AVI
fix suggested by Michael

Originally committed as revision 20118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 10:24:02 +00:00
Reimar Döffinger
f2ad907060 10l in code reading codec_name, the first byte is the length and should not
become part of the string.

Originally committed as revision 20102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 18:27:39 +00:00
Reimar Döffinger
5dd76bd741 Return an error when the parsed mpc chunk size is negative, otherwise we
might end up in an endless loop where the same chunk is parsed over and over.
Fixes a hang near the end for http://samples.mplayerhq.hu/A-codecs/musepack/sv8/sv8-tags.mpc

Originally committed as revision 20099 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 13:35:13 +00:00
Reimar Döffinger
c9da676de4 Disable parsing for ogg streams where no ogg header was found,
if no header was found the parser was not initialized and thus will
crash when trying to use it.

Originally committed as revision 20093 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 09:46:48 +00:00
Reimar Döffinger
19635234b1 Convert latin1 codec_name in mov to UTF-8, since all strings in FFmpeg
must be valid UTF-8.

Originally committed as revision 20092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 09:43:56 +00:00
Reimar Döffinger
4b4ac5c7a8 Sync AC3 probe values with MP3 probe values, they have to avoid similar issues.
This fixes ffmpeg-generated files with -acodec ac3 being detected as raw ac3
instead of MPEG.

Originally committed as revision 20075 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-29 10:23:47 +00:00
Reimar Döffinger
f6765f3f04 Extend DV autodetection to also reliably detect single-frame DVs with
a higher score that MAX/4.
It checks that there are at least 10 DIF headers and at least one per
24000 bytes, and if so considers the file reliably detected as DV.
Passes probetest, too.

Originally committed as revision 20074 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-29 10:12:18 +00:00
Anton Khirnov
6378b06208 Add id3v2 metadata conversion table and use it in mp3 muxer.
Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 20073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-29 07:05:03 +00:00
Baptiste Coudurier
a42bf19134 100l, typo
Originally committed as revision 20033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-26 21:06:18 +00:00
haim alon
7b5252ce3e Export mov/mp4 major and compatible brands as metadata.
Patch by haim alon, haim dot alter at gmail dot com

Originally committed as revision 20032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-26 20:51:38 +00:00
Carl Eugen Hoyos
486168877e Fix reading VDR files (broken since r19000).
Originally committed as revision 20017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-24 19:20:53 +00:00
Reimar Döffinger
98422c44cf Fix possible buffer over-read in vorbis_comment, fix it double to be sure.
First, make s signed, so that comparisons against end - p will not be made as
unsigned, making the check incorrectly pass if p is beyond end.
Also ensure that p will never be > end, so the code is correct also if
buf is not padded.

Originally committed as revision 20014 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-24 15:37:09 +00:00
Anton Khirnov
20c6837880 id3v2: Add support for UTF-16 encoding.
patch by Anton Khirnov, wyskas gmail com

Originally committed as revision 20006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-23 18:22:00 +00:00
Anton Khirnov
9aa1bcce51 id3v2: Use 0 instead of '\0'.
patch by Anton Khirnov, wyskas gmail com

Originally committed as revision 20005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-23 18:10:29 +00:00
Anton Khirnov
787f8fad00 id3v2: check for enough space to write full UTF-8 characters.
patch by Anton Khirnov, wyskas gmail com

Originally committed as revision 20004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-23 18:04:40 +00:00
Reimar Döffinger
7d507ceb79 Correctly print number of remaining bytes in oggparsevorbis instead of always
with inverted sign.

Originally committed as revision 19978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-23 09:18:23 +00:00
Benjamin Larsson
61dc238b45 Hook up the MD studio demuxer and Atrac1 decoder.
Originally committed as revision 19969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 17:28:03 +00:00
Diego Biurrun
de653ba3bb Place MP3 demuxer code under appropriate #ifdefs.
Fixes compilation with --disable-optimizations --disable-demuxers.

Originally committed as revision 19964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 12:39:19 +00:00
Diego Biurrun
8f771e76fd Rearrange wav_muxer and {wav|w64}_demuxer blocks to be under proper #ifdefs.
Fixes compilation with --disable-optimizations --disable-demuxers.

Originally committed as revision 19961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 11:19:36 +00:00
Diego Biurrun
738914be66 Move find_guid function and guid_data array to a globally available place.
Fixes compilation with --disable-optimizations --disable-demuxer=w64.

Originally committed as revision 19959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 10:31:29 +00:00
Diego Biurrun
e9b733bd89 #include correct header to fix 'make checkheaders'.
AVCodecTag is declared in riff.h, not avformat.h.

Originally committed as revision 19915 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-18 19:51:05 +00:00
Michael Niedermayer
e9b0681610 Only use *ic_ptr when it has been initialized.
Originally committed as revision 19911 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-18 13:19:13 +00:00
Ronald S. Bultje
ba93ea6d3e Unscrewup indentation (pointed out by Diego).
Originally committed as revision 19910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-18 13:18:47 +00:00
Ronald S. Bultje
f933789789 RTSP basic authentication, patch originally by Philip Coombes
(philip coombes zoneminder com), see "[PATCH]RTSP Basic Authentication"
thread on mailinglist.

Originally committed as revision 19905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-17 21:47:11 +00:00
Niobos
9deba199fd fix pes overhead computation, patch by Niobos, niobos at dest-unreach dot be
Originally committed as revision 19902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-17 19:07:09 +00:00
Baptiste Coudurier
db46c4e14d print at debug level the score at which codec probing succedeed
Originally committed as revision 19899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-17 18:46:50 +00:00
Reimar Döffinger
5abfae79ca Improve SIFF probe by also checking the first tag is one of the expected.
Originally committed as revision 19898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-17 18:09:20 +00:00
Reimar Döffinger
3214db98ea Improve dxa probe by checking the values for width and height are reasonable.
Originally committed as revision 19897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-17 18:08:07 +00:00
Reimar Döffinger
892d7e78ef Slightly improve probe for ea format by checking that it is possible to
guess whether the file is little- or big-endian.

Originally committed as revision 19896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-17 18:07:27 +00:00
Lars Täuber
f68c8a5039 Do not include "mp4:" prefix from RTMP URL into "app" path or second time
into playpath.

Patch by Lars Täuber
(<$name> . <$lastname with umlaut replaced with diphtong> @ <gmx> . <net>)

Originally committed as revision 19894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-17 05:31:02 +00:00
Michael Niedermayer
1bc8c36125 Print a warning if a format has been detected with a low score.
Originally committed as revision 19890 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 20:44:26 +00:00
Michael Niedermayer
c36823fd3d Print at debug level the score with which probing succeeded.
Originally committed as revision 19889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 20:23:04 +00:00
Michael Niedermayer
8a6c7a5286 Fix indention after last commit.
Originally committed as revision 19888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 20:06:48 +00:00
Michael Niedermayer
e07b882b4d Improve amortized worst case speed of the muxers packet interleaving code
from O(packets_in_the_file) to O(num_of_streams).

Originally committed as revision 19887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 20:04:04 +00:00
Kostya Shishkov
ebd3e99de9 reindent after last commit and remove unneeded empty line
Originally committed as revision 19885 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 18:06:29 +00:00
Kostya Shishkov
f53c9089f6 Make MPC SV8 probe skip tags until stream header is found
Originally committed as revision 19884 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 18:05:21 +00:00
Reimar Döffinger
0d6da4b831 Fix overflow check insufficiently improved in r19840.
It assumes that sizeof(vmd_frame) < 64k, otherwise an additional
check to ensure sound_buffers <= UINT_MAX / sizeof(vmd_frame) would be necessary.

Originally committed as revision 19882 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 15:12:23 +00:00
Peter Ross
5f14b56593 Core Audio Format demuxer
Originally committed as revision 19879 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 12:26:59 +00:00
Peter Ross
2d423666c0 Make mov LPCM and AAC parsing functions public
Originally committed as revision 19878 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 11:35:01 +00:00
Kostya Shishkov
9117213313 Enhance Musepack SV8 probing code
Originally committed as revision 19874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 04:43:33 +00:00
Michael Niedermayer
e458dd0be0 Flv should be AVFMT_VARIABLE_FPS.
Originally committed as revision 19873 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 01:49:34 +00:00
Michael Niedermayer
657eca1f8b Upgrade a few important messages to AV_LOG_WARNING.
Originally committed as revision 19872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 01:47:54 +00:00
Michael Niedermayer
0355537605 Fix indention after previous commit.
Originally committed as revision 19871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 01:17:39 +00:00
Michael Niedermayer
ddce56efc5 Make packet interleaving in the muxer not scan through the whole
buffer when simply appending at the end works.
Much faster if one stream ends prematurely.
Fixes issue1379.

Originally committed as revision 19870 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 00:59:15 +00:00
Michael Niedermayer
42831b46ef Also reset *_end in flush_packet_queue().
Originally committed as revision 19869 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 00:56:31 +00:00
Justin Ruggles
ea25c063c3 10l: set genre default immediately before reading genre tag
Originally committed as revision 19867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 23:40:10 +00:00
Justin Ruggles
d891cbb444 Set ID3v1 genre to 0xFF (unknown) by default instead of 0 (Blues).
Originally committed as revision 19866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 23:37:54 +00:00
Kostya Shishkov
9155be47d1 Do not set 0 FPS in VC-1 test stream format demuxer.
Originally committed as revision 19863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 16:36:53 +00:00
Kostya Shishkov
05db409c28 Check for explicit 32-bit FPS value so it works on 64-bit systems too
Originally committed as revision 19861 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 15:28:11 +00:00
Kostya Shishkov
23218a9801 Make probing for VC1 test bitstream format stricter
Originally committed as revision 19860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 15:22:36 +00:00
Michael Niedermayer
37e34df5a5 Check offset in flv_probe()
Originally committed as revision 19858 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 14:56:09 +00:00
Michael Niedermayer
0535f919d5 Do not return values above AVPROBE_SCORE_MAX from probe().
Originally committed as revision 19857 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 13:28:14 +00:00
Michael Niedermayer
2a3caca2b1 Make h261 and mpegvideo probe a little more robust so they dont fail with
slightly different probetest.

Originally committed as revision 19856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 13:27:13 +00:00
Michael Niedermayer
c4674a479b Make mpeg_probe() pass probetest.
Originally committed as revision 19854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 12:20:03 +00:00
Reimar Döffinger
3489e150d9 Slightly stricter MPEG-PES probing, fixes issue 1383.
Originally committed as revision 19852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 10:01:25 +00:00
Reimar Döffinger
5837e4ca33 Vastly improved mm_probe function, passes probetest.
Originally committed as revision 19851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 09:21:29 +00:00
Reimar Döffinger
97e078087b Improve sierravmd probe. It is still quite weak, but further improvements
are non-obvious and probably need a large (about 1kB at least) probe buffer.

Originally committed as revision 19850 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 09:16:29 +00:00
Michael Niedermayer
1ac9563075 Slighty tweak mp3 probe threshold to prevent probetest from complaining.
Originally committed as revision 19849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-14 23:03:33 +00:00
Reimar Döffinger
6377de611a Try harder to avoid false positives for DV probe.
Require at least one signature match per provided 1MB of probe data,
and if there is only a single match, return at most MAX/4.
Fixes issue1382 but could/should probably still be improved.

Originally committed as revision 19848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-14 22:03:07 +00:00
Reimar Döffinger
98487a5b69 Make dnxhd probe more strict, fail if we detect values in header that would
make our decoder fail anyway.
dnxhd probe now passes probetest.

Originally committed as revision 19847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-14 21:50:23 +00:00
Michael Niedermayer
89c4e176f6 Rewrite h261_probe().
New code can detect h261 startcodes even when the first is damaged or not at the
begin. It also passes probetest v2 & v3.

Originally committed as revision 19845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-14 21:29:19 +00:00
Reimar Döffinger
05bdd33a12 Make DTS probe more robust against false positives (as e.g. probetest shows).
In particular check that the detected markers clearly indicate a specific DTS
format (a wild mixture of e.g. little- and big-endian markers is unlikely to be
a valid DTS file) and ensure the markers appear with sufficient frequency.

Originally committed as revision 19844 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-14 20:28:10 +00:00
Reimar Döffinger
9f449d57c7 Check the index validity more thoroughly for the c93 probe function.
In particular, check that length of the first index entries is not 0 since
that is interpreted "end of file" and makes no sense in the very first entries.

Originally committed as revision 19843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-14 20:01:32 +00:00
Reimar Döffinger
ddbb7c9be2 Add more sanity checks for header elements, rejecting files with clearly
invalid values that wouldn't play right anyway and reduce probe score to MAX/2.
Passes probetest v2.

Originally committed as revision 19842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-14 19:58:51 +00:00
Michael Niedermayer
e4c01d408a Rewrite h263_probe().
The new code should detect h263 even if the first startcode is damaged or
somewhere else than the first byte. It also passes probetest v2 as just
posted on ffmpeg-dev.

Originally committed as revision 19841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-14 19:06:36 +00:00
Reimar Döffinger
21ab5c5827 Extend check for integer overflow for malloc argument to take into account
also the addition of "sound_buffers" not only the multiplication.

Originally committed as revision 19840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-14 17:15:18 +00:00
Kostya Shishkov
65d6d40350 Fix wrong logical operator which causes too relaxed checking in VC-1 test
format probe.
Spotted by Reimar Döffinger.

Originally committed as revision 19839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-14 17:05:13 +00:00
Reimar Döffinger
8466ab59b2 Check buffer size for idcin check, otherwise false positives are too likely for
small probe buffer sizes due to 0-padding (see probetest results).

Originally committed as revision 19838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-14 15:44:05 +00:00
Baptiste Coudurier
8bb7dda2f7 ensure pes buffer is set to avoid segv
Originally committed as revision 19836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-13 20:08:47 +00:00
Baptiste Coudurier
8956f68014 reset pes state to skip after flushing, avoid segv with dvgrab-2009.03.28_19-07-22.m2t
Originally committed as revision 19835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-13 20:06:49 +00:00
Benjamin Larsson
000b8b8699 Add condition to aea demuxer probe.
Originally committed as revision 19833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-13 18:27:53 +00:00
Reimar Döffinger
cbb5da57cd When resetting vst->pkt.data to NULL, also set vst->slices.
This avoids a crash when the next slice is not a start slice and thus
pkt->data is still NULL.
This probably only happens with broken or unsupported files like
http://samples.mplayerhq.hu/real/multirate/JustaSpa1937_64kb.rm
that need further fixes, but keeping vst state consistent is still a good idea.

Originally committed as revision 19830 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-13 11:08:59 +00:00
Ivan Schreter
dbe0ad85c1 Use I/O buffer size as initial value for backoff for seeking sync point search.
Originally committed as revision 19829 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-13 08:57:30 +00:00
Benjamin Larsson
61d00297ab Cosmetics, add spaces
Originally committed as revision 19816 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-10 19:12:13 +00:00
Benjamin Larsson
d0b57c6f85 Initial commit of the MD studio demuxer, not hooked up yet
Originally committed as revision 19812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-10 18:48:12 +00:00
shinya.tesutosan@hotmail.com
e5f58f81f7 Document padding for AVProbeData.
Patch by roundup user shinya, tesutosan hotmail

Originally committed as revision 19802 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-09 22:55:10 +00:00
Maksym Veremeyenko
2c14ded386 Fix a bug with reading non-interleaved AVI if one the streams is
shorter.

Patch by Maksym Veremeyenko, verem m1stereo tv

Originally committed as revision 19798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-09 16:26:24 +00:00
Maksym Veremeyenko
b60de406a4 Factorise st->nb_index_entries check.
Patch by Maksym Veremeyenko, verem m1stereo tv

Originally committed as revision 19797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-09 16:25:12 +00:00
Baptiste Coudurier
e4bc8af1e6 check entries against field_size, potential malloc overflow in read_stsz, fix #1357
Originally committed as revision 19793 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-07 22:42:51 +00:00
Baptiste Coudurier
1c4bf2ec37 add one missing check for stream existence in read_elst, fix #1364
Originally committed as revision 19792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-07 22:36:33 +00:00
Martin Storsjö
b126dee964 Use all 32 bits of the timestamp when calculating flv duration.
At the moment, duration is mainly set from the metadata packet. If that is not
available, the fallback is checking the low 24 bits of the last packet. This is
not enough for files over 4,6 hours in length, so read all 32 bits instead.
patch by Martin Storsjö, martin martin st

Originally committed as revision 19791 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-07 10:49:51 +00:00
Ivan Schreter
af8aae3fa3 disable new seeking code in mpeg-ts per #ifdef (use old read_seek by default)
Originally committed as revision 19788 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-06 15:59:32 +00:00
Reimar Döffinger
88e70e1b0a ff_rm_metadata is const.
Originally committed as revision 19786 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-06 08:57:19 +00:00