virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
57,071 Commits 39 Branches 425 Tags
8de021fabe3a1c7a1465d5fa6e238803a3d82f04
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Larsson 62784e3733 Add the CODEC_CAP_CHANNEL_CONF capability code and add 
that flag to the dca codec. This capability when set
will make sure the codec will initialize the channel
configuration instead of trusting the container. This
fixes issue 2137 and issue 850.

Originally committed as revision 25320 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 22:18:02 +00:00
Benjamin Larsson 4792d1e792 Support deinterlacing of YUVJ420P. 
Originally committed as revision 25148 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-20 11:34:27 +00:00
Benjamin Larsson 324a94b022 DCA: *_bits() -> *_bits_long() where needed, half fix for broken bitstream parsing 
Originally committed as revision 24051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-05 01:43:47 +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
Benjamin Larsson 58f48adb51 Add DynamicACL support for FFserver. 
Originally committed as revision 22815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-07 20:06:02 +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
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
Benjamin Larsson e704b012f2 Mention SDDS so search engines will pick it up for when someone 
needs to decode the SDDS tracks found on 35 mm movies.

Originally committed as revision 19968 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-22 17:05:19 +00:00
Benjamin Larsson edd897b1b3 Use ff_sine_32 in atrac1. 
Originally committed as revision 19967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-22 17:03:28 +00:00
Benjamin Larsson 9caab87829 Add forgotten cleanup function in atrac1. 
Originally committed as revision 19954 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-21 21:00:18 +00:00
Benjamin Larsson 78b3a12d9c Cosmetics, indentation. 
Originally committed as revision 19953 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-21 20:53:29 +00:00
Benjamin Larsson a872e5c1f4 Cosmetics. Merge declaration and initialization. 
Originally committed as revision 19952 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-21 20:52:24 +00:00
Benjamin Larsson b6a237025d Move the scale factor and word length indexes to the stack. 
Originally committed as revision 19951 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-21 20:49:08 +00:00
Benjamin Larsson 803d8488f2 Align sample output buffer in atrac1. 
Originally committed as revision 19918 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-19 01:46:03 +00:00
Benjamin Larsson 0105f49792 Fix the short block transform for atrac1. 
Originally committed as revision 19917 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-19 01:45:00 +00:00
Benjamin Larsson 10634c037a Only use one mdct window size in atrac1. 
Originally committed as revision 19900 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-17 18:52:11 +00:00
Benjamin Larsson 6acd4d89d8 Do not release the AVFrame when using reget_buffer in flashsv. 
Originally committed as revision 19834 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-13 19:17:02 +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
Benjamin Larsson 04a6d1b0db Cosmetics. Renames, indentation and spacing. 
Originally committed as revision 19832 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-13 18:05:14 +00:00
Benjamin Larsson 2dbcb03ad5 Remove table that was forgotten in the split. 
Originally committed as revision 19824 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-11 19:39:40 +00:00
Benjamin Larsson acc69c1cab Fix doxygen comment 
Originally committed as revision 19823 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-11 19:38:26 +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 c64c0a9b76 Move get_arg to avoid future declaration of function when 
new code is added.

Originally committed as revision 19815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-10 19:08:03 +00:00
Benjamin Larsson 7141c8594d Use reget_buffer instead of get_buffer. Fixes issue1367. 
Patch by jarkko.palviainen.sesca.com.

Originally committed as revision 19814 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-10 19:01:53 +00:00
Benjamin Larsson 223e8df136 Add ATRAC1 codec ID. 
Originally committed as revision 19813 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-10 18:49:25 +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
Benjamin Larsson dbb0f96f0f Initial commit of the atrac1 decoder, not hooked up yet 
Originally committed as revision 19811 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-10 18:47:02 +00:00
Benjamin Larsson 76ec34a5c3 Remove redundant code forgotten in the split 
Originally committed as revision 19810 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-10 18:39:57 +00:00
Benjamin Larsson 76bcd87b4c Change developer doc to reflect reality 
Originally committed as revision 19799 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-09 17:27:30 +00:00
Benjamin Larsson 0e1baedec3 Split out common routines needed in the atrac1 decoder from atrac3.c to atrac.c. 
Originally committed as revision 19796 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-08 19:25:54 +00:00
Benjamin Larsson 7dd5568924 Indent 
Originally committed as revision 18866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-17 16:13:03 +00:00
Benjamin Larsson 031b1cbeeb Change from INIT_VLC_USE_STATIC to INIT_VLC_USE_NEW_STATIC in atrac3 
Originally committed as revision 18865 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-17 16:12:07 +00:00
Benjamin Larsson fbf4d03a7c Indent 
Originally committed as revision 18864 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-17 10:31:16 +00:00
Benjamin Larsson 8d9f12657c Switch from INIT_VLC_USE_STATIC to INIT_VLC_USE_NEW_STATIC in qdm2. 
Originally committed as revision 18863 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-17 10:29:40 +00:00
Benjamin Larsson e5cd2d3dca Bugfix for bug introduced in the multichannel cook patchset. 
Originally committed as revision 18842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-15 16:25:54 +00:00
Benjamin Larsson 841b45e55d Remove dead nested assignment found by CSA 
Originally committed as revision 18784 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-10 14:44:09 +00:00
Benjamin Larsson 0871e65cf6 Remove unused code found by CSA 
Originally committed as revision 18783 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-10 14:33:40 +00:00
Benjamin Larsson 6b71ed1678 Remove dead assignments found by CSA 
Originally committed as revision 18733 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-03 09:32:40 +00:00
Benjamin Larsson 241f5eab32 Remove dead assignments found by CSA 
Originally committed as revision 18731 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-02 09:12:03 +00:00
Benjamin Larsson 10c773c12f Remove dead assignments found by CSA 
Originally committed as revision 18730 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-02 09:08:40 +00:00
Benjamin Larsson bdb8d99613 Proper subpacket size check for cook multichannel files. 
Originally committed as revision 18693 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-25 20:09:34 +00:00
Benjamin Larsson bb1135c8a3 Remove parentheses 
Originally committed as revision 18692 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-25 19:47:18 +00:00
Benjamin Larsson fcc01e646b Set the type of size in COOKSubpacket to unsigned 
Originally committed as revision 18691 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-25 18:43:30 +00:00
Benjamin Larsson ec32cfd2cc Make sure we only parse max amount of subpackets (5) in the cook decoder. 
Originally committed as revision 18689 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-25 17:46:27 +00:00
Benjamin Larsson da75426b26 Indent 
Originally committed as revision 18688 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-25 17:35:21 +00:00
Benjamin Larsson 0a704b5f21 Remove redundant code 
Originally committed as revision 18687 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-25 17:33:36 +00:00
Benjamin Larsson 9189d7eba6 Add Changelog for Cook multi channel support 
Originally committed as revision 18686 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-25 10:47:24 +00:00
Benjamin Larsson 67da31826f Support cook multichannel files. 
Originally committed as revision 18685 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-25 10:46:07 +00:00
Benjamin Larsson 7204850ea9 Fix the COOKDEBUG code 
Originally committed as revision 18684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-25 10:25:14 +00:00
Benjamin Larsson 4a291c90fe Factor out COOKSubpacket, in preparation for multichannel support. 
Originally committed as revision 18683 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-25 10:20:48 +00:00
Benjamin Larsson 6c73a7d06c Remove redundant code, found by CSA 
Originally committed as revision 18661 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-22 13:52:33 +00:00
Benjamin Larsson 39b60944a8 Get rid of av_random in cook.c 
Originally committed as revision 18079 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 21:32:30 +00:00
Benjamin Larsson 3b0b84797e Get rid of av_random in nellymoserdec.c 
Originally committed as revision 18078 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 21:15:02 +00:00
Benjamin Larsson b217024706 Add cook channel count function, part of multichannel cook 
Originally committed as revision 17992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 19:36:45 +00:00
Benjamin Larsson 0eec287596 Add max allowed subpackets in multichannel cook 
Originally committed as revision 17991 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 19:34:52 +00:00
Benjamin Larsson d4b3d0408f save avctx in cook decoder context and use it for av_log 
Originally committed as revision 17988 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 14:11:11 +00:00
Benjamin Larsson 7c119ced99 memset when category is >=7, part of cook multichannel 
Originally committed as revision 17987 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 14:04:25 +00:00
Benjamin Larsson aa8d024ce2 Allocate trellis tables on heap only when needed. 
Originally committed as revision 16945 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 18:51:02 +00:00
Benjamin Larsson 673bcc3d0a I'll take care of qdm2 also 
Originally committed as revision 16741 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 10:52:26 +00:00
Benjamin Larsson 336c2ca585 Add size that is needed for the wmapro codec 
Originally committed as revision 16533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 10:40:05 +00:00
Benjamin Larsson 13367a46bc channel layout support for ffmpeg.c 
Originally committed as revision 15956 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-29 19:32:42 +00:00
Benjamin Larsson b836fb0060 Silence warning in imc decoder 
Originally committed as revision 15844 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-16 10:16:07 +00:00
Benjamin Larsson 31d5113a15 Set channel_layout 
Originally committed as revision 15843 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-16 09:54:09 +00:00
Benjamin Larsson 92765276fb Proper channel output reordering for the dca decoder. 
Originally committed as revision 15832 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 20:31:03 +00:00
Benjamin Larsson e22192ecc3 Comment typo 
Originally committed as revision 15801 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-11 08:46:29 +00:00
Benjamin Larsson cd027b511e Remove channel layout table that only should be used by encoders. 
Originally committed as revision 15800 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-11 08:30:32 +00:00
Benjamin Larsson c6eaba62e8 Change the dca channel layout, S -> SIDE not BACK. 
Originally committed as revision 15769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-02 21:51:27 +00:00
Benjamin Larsson 48dc2fb800 Guess channel layout based on the number of channels if a custom layout is specified in amode. 
Originally committed as revision 15766 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-01 20:49:37 +00:00
Benjamin Larsson 87c3b9bce3 Add channel layouts for dca. 
Originally committed as revision 15765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-01 20:27:05 +00:00
Benjamin Larsson d5b3a86393 Fix compilation, remove stray ; 
Originally committed as revision 15735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-28 15:20:52 +00:00
Benjamin Larsson 9ed73b4870 Fix selection of quant step table 
Originally committed as revision 15734 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-28 14:50:46 +00:00
Benjamin Larsson 6f02853d14 Fix huffman coded dca samples. 
Originally committed as revision 15733 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-28 14:43:06 +00:00
Benjamin Larsson ba5fc967f6 Disable codec downmix when not using simd instead of silently produce silence 
Originally committed as revision 15715 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-26 10:14:16 +00:00
Benjamin Larsson 1402ee721a Fix dca decoder with non simd float2int16 conversion 
Originally committed as revision 15714 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-26 09:54:53 +00:00
Benjamin Larsson 49c91c34b3 Fix compilation with TRACE 
Originally committed as revision 15713 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-26 09:50:15 +00:00
Benjamin Larsson 2426bb960a add ok parts to the rm demuxer for SIPRO support 
Originally committed as revision 15426 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-26 12:12:25 +00:00
Benjamin Larsson faeedbbb06 Add support for Acelp.net fourcc and codecid, remuxing wav to avi should work 
Originally committed as revision 15425 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-26 10:59:42 +00:00
Benjamin Larsson 1b46683c80 FOURCC addition: added 3IV2, another mpeg4 id. incoming/video_3iv2/video_3iv2.avi 
Originally committed as revision 14681 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-10 15:34:29 +00:00
Benjamin Larsson 20455a335b Reduce the loglevel on a log message in the Nellymoser decoder. Related to Roundup 447. 
Originally committed as revision 14348 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-23 12:21:56 +00:00
Benjamin Larsson d11f9e1b15 Prevent the qdm2 code from overreading/overflowing. Fixes Coverity ID 112 run 2 
Originally committed as revision 14309 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-19 18:53:04 +00:00
Benjamin Larsson f7dbf86d93 Fix for possible null pointer dereferencing, closes Coverity report 68 run 2. 
Originally committed as revision 14305 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-19 15:48:53 +00:00
Benjamin Larsson 7769875db3 redundant assignment found by Clang 
Originally committed as revision 14096 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-07 08:29:08 +00:00
Benjamin Larsson 75d27450a1 Add support for mp3 contained in oma 
Originally committed as revision 13980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-25 19:59:52 +00:00
Benjamin Larsson de8c8181a9 Rearrange parameter logic 
Originally committed as revision 13979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-25 19:57:57 +00:00
Benjamin Larsson f035fe9755 Add more codec IDs and tags. 
Originally committed as revision 13977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-25 19:39:38 +00:00
Benjamin Larsson f059427cf0 Forgotten oma docs stuff 
Originally committed as revision 13766 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-13 14:51:55 +00:00
Benjamin Larsson ea66253452 We have an Oma demuxer now 
Originally committed as revision 13749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-11 20:11:04 +00:00
Benjamin Larsson b339f0c6be Oma demuxer 
Originally committed as revision 13712 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-08 17:12:25 +00:00
Benjamin Larsson 17125bd9da Sample tested and the code worked so the comment is removed 
Originally committed as revision 13650 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 16:46:38 +00:00
Benjamin Larsson d311f8f3e3 Update copyright and text 
Originally committed as revision 13239 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-22 19:42:02 +00:00
Benjamin Larsson fde8052e4e dts probe 
Originally committed as revision 13040 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-03 00:12:32 +00:00
Benjamin Larsson c401efdefe Long name spelling fixes 
Originally committed as revision 13038 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-02 22:58:16 +00:00
Benjamin Larsson 63d864434d Raw dts muxer 
Originally committed as revision 12912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-20 20:28:12 +00:00
Benjamin Larsson 4a24837e07 Only set channels in the stream if previously unset, fixes resampling crash on broken dca frames 
Originally committed as revision 12780 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-10 06:15:17 +00:00
Benjamin Larsson ebf71dbda5 Don't use unchecked data from the bitstream. 
Originally committed as revision 12351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-06 14:22:02 +00:00
Benjamin Larsson 40bcf4c780 Support setting the debuglevel (-g level) with --enable-debug=# 
Originally committed as revision 12298 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-03 16:59:53 +00:00
Benjamin Larsson 800b9c24b7 Add more riff IDs to support remuxing. 
Originally committed as revision 12266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-27 20:34:44 +00:00
Benjamin Larsson 7bb8d51c1f Riff ids for wmapro and wmavoice, this adds support for stream copy of these codecs between asf,avi and wav containers. 
Originally committed as revision 12182 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-23 23:30:41 +00:00
Benjamin Larsson ad40b15394 silence wmaenc.c:181: warning:suggestparentheses around assignment used as truth value 
Originally committed as revision 11940 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-15 13:44:08 +00:00