videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity
27,378 Commits 36 Branches 392 Tags 198 MiB
Commit Graph

6827 Commits

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

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 2b0decf60b)
 2011-01-26 03:43:28 +01:00
Kostya 69c78161d2 reindent after last commit 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit dacbcd170a)
 2011-01-26 03:43:28 +01:00
Kostya 8a485dd399 Extend WavPack demuxer and decoder to support >2 channel audio 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 3bdc886c22)
 2011-01-26 03:43:28 +01:00
Jai Menon 9de202a633 ffmetaenc : Use more correct format specifiers. 
Additionally, this fixes a warning when building with clang.
 2011-01-24 22:55:43 -06:00
Baptiste Coudurier d4e0130e46 In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it. 
In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet.
 2011-01-24 14:20:48 -08:00
Anton Khirnov 5b7e7544e1 mp3enc: support for id3v2.3 tags using a per-muxer AVOption 
fixes issue2562.

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

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

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

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

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

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

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

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

fixes issue2419

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

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

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 69688e71bc)
 2011-01-21 20:35:46 +01:00
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