generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
27,906 Commits 24 Branches 241 Tags 173 MiB
bca6dee386
Commit Graph

7043 Commits

Author SHA1 Message Date
Mans Rullgard
c4f8765ac5 Revert "mov: simplify mov_read_chapters() by using avio_get_str16be" 
This reverts commit c34461b35b.
The wrong version of the patch was committed.
 2011-01-26 22:03:21 +00:00
Diego Elio Pettenò
2d162e3825 Make ff_cmap_read_palette static to libavcodec/iff.c. Delete iff.h. 
The iff.h header only declared one function that is now static, the
libavformat/iff.c source file wasn't using it before. Drop the file
entirely.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:04 +00:00
Georgi Chorbadzhiyski
535638b55f mpegtsenc: set reserved bits to 1 in PCR field 
The reserved bits between PCR base and extension fields must be
set to 1.

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

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

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

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

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

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 12:52:45 +00:00
Mans Rullgard
6081f8c4e2 avidec: make print_tag() a macro and remove related ifdefs 
The dprintf macro is a no-op if DEBUG is not defined, so there
is no need to guard it here.

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

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

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

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

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

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

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

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

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

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 20:21:51 +00:00
Anton Khirnov
4efd5cf34b avio: add av_put_str and deprecate put_strz in favor of it 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 20:21:03 +00:00
Anton Khirnov
50196a982b lavf: move the version macros to a new header 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 19:30:51 +00:00
Anton Khirnov
d66eff3685 id3v2: use an enum for encodings instead of magic numbers. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 18:42:10 +00:00
Anton Khirnov
d08928bbea Split mp3 demuxer and muxer into separate files. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 15:11:52 +00:00
Janne Grunau
e5fe65512b mpegtsenc: prefer metadata keyed with "service_name" 
title metadata is only used as fallback if no service_name is available.

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

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

fixes issue2419

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

This fixes issue 2448.

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

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

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

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

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

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

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

Patch by David Czech, davidczech510 gmail

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

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

Patch by Zhentan Feng <spyfeng gmail com>.

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

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

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

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

Patch by Thomas Guillem, thomas dot guillem at gmail

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Patch by Anssi Hannula, anssi d hannula a iki fi

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Patch by Yuriy Kaminskiy, yumkam at mail dot ru.

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

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

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

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

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

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

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

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

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

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

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

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

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

Originally committed as revision 25499 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 08:50:50 +00:00
Baptiste Coudurier
96d1e75a0c In mov muxer, write artist metadata tag 
Originally committed as revision 25498 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 23:23:47 +00:00
Baptiste Coudurier
edd33cb6fa In mov muxer, use correct metadata tag for encoder, and use the generic metadata api name 
Originally committed as revision 25497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 23:16:11 +00:00