summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* mpegtsenc: prefer metadata keyed with "service_name"Janne Grunau2011-01-211-2/+2
| | | | | | | title metadata is only used as fallback if no service_name is available. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit e5fe65512bfc824b9827ed29909a54122582ef2a)
* Set service_provider and service_name in mpegts demuxerGeorgi Chorbadzhiyski2011-01-211-2/+2
| | | | | | | | | Set service_provider and service_name in mpegts demuxer, previously name and provider_name were set but since the muxer uses service_provider and service_name use them. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit e8315e78814f92d6d031bd3a909d896351a416f8)
* id3v2: don't overwrite existing tagsAnton Khirnov2011-01-211-1/+1
| | | | | | | | | | | Apparently some broken taggers prepend a new ID3v2 tag leaving the existing one intact. Our parser currently reads all tags and overwrites existing values with supposedly outdated ones. fixes issue2419 Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 75aded8328e35c9391e25a1c857eb6e3b801a8d8)
* id3v2: convert metadata after all the tags were readAnton Khirnov2011-01-211-2/+2
| | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit f7fcd6a2549b58a69c02622503676a8b142e4c43)
* id3v2: make ff_id3v2_parse staticAnton Khirnov2011-01-212-34/+28
| | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 46a2da7698634214eed6d269fc72d284e3d3700f)
* Add service_provider and service_name metadataGeorgi Chorbadzhiyski2011-01-212-3/+9
| | | | | | | | | | | | | | | This patch adds support in mpegts muxer for using service_provider and service_name metadata to set service_provider_name and service_name fields in SDT. Example usage: ffmpeg -i file.ts -f mpegts -re -acodec copy -vcodec copy -f mpegts \ -metadata service_provider="Some provider" \ -metadata service_name="Some Channel" \ "udp://239.0.70.2:5000?pkt_size=1316&ttl=1" Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 69688e71bc4c4318209e8d4e3861c47186caebda)
* consolidate .gitignore patters into a single fileJanne Grunau2011-01-181-8/+0
| | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* Revise check for codec id in voc demuxer.Justin Ruggles2011-01-181-13/+16
| | | | This fixes demuxing of packets that do not contain a codec tag and come before the codec_id has been set.
* Fix bug in voc demuxer that was introduced in SVN r26309.Justin Ruggles2011-01-181-1/+1
| | | | Fixes issue 2560.
* Missing parts of IVF muxer support.Reimar Döffinger2011-01-183-2/+3
|
* Add muxer for IVF format.Reimar Döffinger2011-01-171-0/+69
|
* prevent integer overflow in calculating durationJohn Wimer2011-01-171-1/+1
| | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* convert svn:ignore properties to .gitignore filesJanne Grunau2011-01-171-0/+8
| | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* Check 4xm headers for validity. This should avoid 1/0.Michael Niedermayer2011-01-161-1/+8
| | | | Originally committed as revision 26392 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Parse fact chunks from wav files to find duration.Michael Niedermayer2011-01-151-1/+12
| | | | Originally committed as revision 26370 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factor tag reading code out of wav read_header()Michael Niedermayer2011-01-151-2/+8
| | | | Originally committed as revision 26369 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Set duration for wav files from sample size and data size or the wf64 sample ↵Michael Niedermayer2011-01-151-0/+7
| | | | | | | | | 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
* In mxf muxer, check the return value of gmtime, fix #2494Baptiste Coudurier2011-01-141-0/+2
| | | | Originally committed as revision 26343 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Copy metadata from ASF files contained in RTSP streams from ASF to RTSP layer,Ronald S. Bultje2011-01-141-0/+1
| | | | | | so that applications can read it also. Originally committed as revision 26332 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Introduce av_metadata_copy() to copy metadata from one struct to another.Ronald S. Bultje2011-01-142-1/+19
| | | | Originally committed as revision 26330 to svn://svn.ffmpeg.org/ffmpeg/trunk
* wtv: ignore VIDEOINFOHEADER2 picture aspect ratio information, as it is ↵Peter Ross2011-01-141-6/+1
| | | | | | unreliable Originally committed as revision 26327 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Revert aviobuf: Retry if the read/write function returns AVERROR(EAGAIN)Martin Storsjö2011-01-131-25/+3
| | | | | | This reverts SVN commit 26318, which broke MS-RTSP playback. Originally committed as revision 26326 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use AVERROR_INVALIDDATA rather than -1 for nutdec error codes.Stefano Sabatini2011-01-121-14/+14
| | | | Originally committed as revision 26321 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aviobuf: Retry if the read/write function returns AVERROR(EAGAIN)Martin Storsjö2011-01-121-3/+25
| | | | Originally committed as revision 26318 to svn://svn.ffmpeg.org/ffmpeg/trunk
* In mov demuxer, handle better wrong time scale, fix issue #2528Baptiste Coudurier2011-01-111-3/+3
| | | | Originally committed as revision 26311 to svn://svn.ffmpeg.org/ffmpeg/trunk
* In mov demuxer, set r_frame_rate for cfr filesBaptiste Coudurier2011-01-111-0/+4
| | | | Originally committed as revision 26310 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not crash for illegal sample size, fixes issue 2502.Daniel Kang2011-01-111-3/+15
| | | | | | Patch by Daniel Kang, daniel.d.kang at gmail Originally committed as revision 26309 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Clarify timestamps related error messages in compute_pkt_fields2().Stefano Sabatini2011-01-111-2/+2
| | | | Originally committed as revision 26308 to svn://svn.ffmpeg.org/ffmpeg/trunk
* electronicarts: prevent endless loop opportunity in ↵Peter Ross2011-01-111-2/+2
| | | | | | | | process_audio_header_elements() Fixes issue2529. Originally committed as revision 26307 to svn://svn.ffmpeg.org/ffmpeg/trunk
* revert r26302Peter Ross2011-01-101-2/+0
| | | | Originally committed as revision 26305 to svn://svn.ffmpeg.org/ffmpeg/trunk
* electronicarts: prevent endless loop opportunity in ↵Peter Ross2011-01-101-0/+2
| | | | | | | | process_audio_header_elements() Fixes issue2529. Originally committed as revision 26302 to svn://svn.ffmpeg.org/ffmpeg/trunk
* electronicarts: only apply audio sanity checks when audio stream is presentPeter Ross2011-01-101-10/+11
| | | | Originally committed as revision 26301 to svn://svn.ffmpeg.org/ffmpeg/trunk
* perform sanity check on sample rate in electronicarts demuxerDaniel Kang2011-01-101-0/+5
| | | | | | | Fixes issue2525 Original patch by Daniel Kang, daniel.d.kang at gmail Originally committed as revision 26298 to svn://svn.ffmpeg.org/ffmpeg/trunk
* perform sanity check on number of channels in electronicarts demuxerDaniel Kang2011-01-101-0/+5
| | | | | | | Fixes issue2514 Original patch by Daniel Kang, daniel.d.kang at gmail Originally committed as revision 26296 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rtsp: Properly fail if unable to open an input RTP portMartin Storsjö2011-01-091-0/+4
| | | | Originally committed as revision 26285 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix indentationPeter Ross2011-01-091-9/+9
| | | | Originally committed as revision 26278 to svn://svn.ffmpeg.org/ffmpeg/trunk
* wtv: only process timestamp_guid chunks for streams that we know aboutPeter Ross2011-01-091-0/+3
| | | | Originally committed as revision 26277 to svn://svn.ffmpeg.org/ffmpeg/trunk
* wtv: do not repopulate codec information after we have seen data chunksPeter Ross2011-01-091-1/+11
| | | | Originally committed as revision 26276 to svn://svn.ffmpeg.org/ffmpeg/trunk
* wtv: stop processing chunks if length is smaller than chunk headerPeter Ross2011-01-091-0/+2
| | | | Originally committed as revision 26275 to svn://svn.ffmpeg.org/ffmpeg/trunk
* wtv: fix typoPeter Ross2011-01-091-1/+1
| | | | Originally committed as revision 26274 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add audio codec 0x1602 (AAC LATM)Peter Ross2011-01-091-0/+6
| | | | Originally committed as revision 26273 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Lagarith decoder by Nathan Caldwell, saintdev at gmailCarl Eugen Hoyos2011-01-081-0/+1
| | | | Originally committed as revision 26270 to svn://svn.ffmpeg.org/ffmpeg/trunk
* In mov muxer, override codec tag for dv in mov, fix remuxing from aviBaptiste Coudurier2011-01-071-1/+1
| | | | Originally committed as revision 26257 to svn://svn.ffmpeg.org/ffmpeg/trunk
* In mov muxer, override codec tag for h263 in mov, fix remuxing from 3gpBaptiste Coudurier2011-01-071-0/+1
| | | | Originally committed as revision 26255 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rtsp: Allow requesting of filtering of source packetsMartin Storsjö2011-01-062-3/+11
| | | | | | | | | | | | | | | | | 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
* udp: Allow specifying the connect option in udp_set_remote_url, tooMartin Storsjö2011-01-061-1/+17
| | | | | | | 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
* rtpproto: Allow specifying the connect option, passed through to udpMartin Storsjö2011-01-061-4/+13
| | | | | | | | 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
* Set blkalign to 3840 (maximum bytes per frame) for AC-3 in avi.Carl Eugen Hoyos2011-01-061-5/+3
| | | | | | Fixes playback for corner-cases like 32kHz 320kb. Originally committed as revision 26242 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rtpdec: Don't set RTP timestamps if they already are set by the depacketizerMartin Storsjö2011-01-061-0/+2
| | | | | | | | | | | | | | 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
* Fix assertion fail on audio files with invalid sample rates,Daniel Kang2011-01-061-1/+1
| | | | | | | | fixes issue 2475. Patch by Daniel Kang, daniel.d.kang at gmail Originally committed as revision 26240 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud