RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
46,493 Commits 37 Branches 400 Tags 256 MiB
Commit Graph

46493 Commits

Author SHA1 Message Date
Peter Ross 1701a22fce wtv: rename ff_stream_guid to ff_SBE2_STREAM_DESC_EVENT 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 15:51:41 +01:00
Peter Ross 9632f5efcf wtvenc: fix typo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 15:50:36 +01:00
Michael Niedermayer 1e4e497911 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: atrac: Place atrac1 and atrac3 tests in different groups
  fate: aac: cosmetics: Group AAC LATM tests together
  x86: avresample: Add missing colons to assembly labels

Conflicts:
	tests/fate/aac.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 15:11:53 +01:00
Paul B Mahol 0fe8c9f458 wavpack: use more meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-06 12:56:44 +00:00
Diego Biurrun e6c4c0f7cf fate: atrac: Place atrac1 and atrac3 tests in different groups 2012-11-06 13:47:53 +01:00
Diego Biurrun 06c7b33831 fate: aac: cosmetics: Group AAC LATM tests together 2012-11-06 13:37:36 +01:00
Stefano Sabatini f6b39376ce .gitignore: ignore *.3 files as well 2012-11-06 12:24:12 +01:00
Stefano Sabatini a1934daeb4 doc/Makefile: remove .3 file with make clean 2012-11-06 12:23:13 +01:00
Diego Biurrun 352e18b766 x86: avresample: Add missing colons to assembly labels 
YASM accepts labels without colons, but NASM issues warnings.
 2012-11-06 12:07:35 +01:00
Alexander Strasser 98506e16c7 doc/libavcodec: do not say multimedia streams in the title 
The mention of multimedia stream sounds more like multiple
elementary media streams like video and audio multiplexed
into a multimedia container format.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2012-11-06 11:55:37 +01:00
Alexander Strasser 23b57b0203 doc/libavcodec: improve wording in description 
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2012-11-06 11:55:29 +01:00
Stefano Sabatini d658f9a1cb doc/ffserver: fix typos/reword paragraphs about FFM versions 2012-11-06 11:35:14 +01:00
Stefano Sabatini e8c0b6710c examples/muxing: fix typo: allocated -> allocate 2012-11-06 11:28:28 +01:00
Michael Niedermayer 6a302331dd Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: adjust external clock speed based on buffer fullness for realtime sources

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 04:02:42 +01:00
Michael Niedermayer 2a0dfc51ea img2enc: support 16bit per sample yuv in split planes. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 02:27:04 +01:00
Michael Niedermayer 52c40a0e52 MAINTAINERS: fix entry for img2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 01:46:21 +01:00
Michael Niedermayer 2c87565147 img2enc: support storing alpha planes too in split plane mode 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 01:42:26 +01:00
Michael Niedermayer db012e161e img2enc: Fix yuva with yuv split planes. 
Previously the chroma planes where corrupted in this case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 01:31:41 +01:00
Michael Niedermayer 67ee2d2f6d img2enc: check pix_fmt for split planes mode. 
Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 01:31:41 +01:00
Michael Niedermayer 6dfcc7abdd img2enc: ensure that the codec is rawvideo for split planes mode. 
Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 01:31:41 +01:00
Stefano Sabatini 7f6f8f642c examples/demuxing: fix braino 
s/video/audio/ in a log message.
 2012-11-06 01:10:12 +01:00
Stefano Sabatini 794cea588c examples/demuxing: dump input information *after* trying to open audio stream 
Implement more logical code flow.
 2012-11-06 01:10:12 +01:00
Paul B Mahol c99564492c fate: add more pix_fmt tests for xwd 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-05 22:31:24 +00:00
Michael Niedermayer 6493842900 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  FATE: add a 24-bit FLAC encoding test
  FATE: rename FLAC tests from flac-* to flac-16-*
  flacenc: use RICE2 entropy coding mode for 24-bit
  flacenc: add 24-bit encoding
  flacdsp: move lpc encoding from FLAC encoder to FLACDSPContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 23:01:34 +01:00
Michael Niedermayer 7d26be63c2 Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e' 
* commit '5ff998a233d759d0de83ea6f95c383d03d25d88e':
  flacenc: use uint64_t for bit counts
  flacenc: remove wasted trailing 0 bits
  lavu: add av_ctz() for trailing zero bit count
  flacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian
  fate: aac: Place LATM tests and general AAC tests in different groups
  build: The A64 muxer depends on rawenc.o for ff_raw_write_packet()

Conflicts:
	doc/APIchanges
	libavutil/version.h
	tests/fate/aac.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 22:51:20 +01:00
Michael Niedermayer e859339e7a Merge commit '930e26a3ea9d223e04bac4cdde13697cec770031' 
* commit '930e26a3ea9d223e04bac4cdde13697cec770031':
  x86: h264qpel: Only define mmxext QPEL functions if H264QPEL is enabled
  x86: PABSW: port to cpuflags
  x86: vc1dsp: port to cpuflags
  rtmp: Use av_strlcat instead of strncat

Conflicts:
	libavcodec/x86/h264_qpel.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 22:36:05 +01:00
Martin Storsjö f0615557e0 rtmpproto: Use av_strlcat instead of strncat 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes: [FFmpeg-devel] rtmpproto compile error
Similar patch: [FFmpeg-devel] [PATCH] call to strncat replaced with av_strlcat to avoid compile issue with systems implementing strncat via strcat.
 2012-11-05 21:47:43 +01:00
Paul B Mahol 10ac70d249 avrndec: use more meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-05 20:47:22 +00:00
Paul B Mahol 70727e8774 lavf/avr: make .long_name consistent with others 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-05 20:47:22 +00:00
Paul B Mahol efbe162f7d cljr: use meaningful error code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-05 20:47:13 +00:00
Justin Ruggles 8a58894fc6 FATE: add a 24-bit FLAC encoding test 2012-11-05 15:32:30 -05:00
Justin Ruggles 5ff998a233 flacenc: use uint64_t for bit counts 
Needed to avoid integer overflows for 24-bit encoding.
 2012-11-05 15:32:30 -05:00
Justin Ruggles 31c3b9c95e FATE: rename FLAC tests from flac-* to flac-16-* 
This will distinguish FLAC 16-bit tests from FLAC tests with other bit
depths.
 2012-11-05 15:32:30 -05:00
Justin Ruggles e783316322 flacenc: remove wasted trailing 0 bits 2012-11-05 15:32:30 -05:00
Justin Ruggles 2e76f34387 flacenc: use RICE2 entropy coding mode for 24-bit 2012-11-05 15:32:30 -05:00
Justin Ruggles 13e1ee6c84 flacenc: add 24-bit encoding 2012-11-05 15:32:30 -05:00
Justin Ruggles 799e232490 flacdsp: move lpc encoding from FLAC encoder to FLACDSPContext 
Also, templatize the functions for 16-bit and 32-bit sample range. This will
be used for 24-bit FLAC encoding.
 2012-11-05 15:32:30 -05:00
Justin Ruggles dfde8a34e5 lavu: add av_ctz() for trailing zero bit count 2012-11-05 15:32:29 -05:00
Justin Ruggles 6a744d2619 flacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian 
This is much faster than calculating the MD5 one sample at a time.
 2012-11-05 15:32:29 -05:00
Michael Niedermayer 282a6308bf udp: check ff_socket_nonblock() return code 
Fixes CID733719
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 21:21:04 +01:00
Diego Biurrun 2253df76c1 fate: aac: Place LATM tests and general AAC tests in different groups 2012-11-05 20:48:50 +01:00
Diego Biurrun 92fec47d69 build: The A64 muxer depends on rawenc.o for ff_raw_write_packet() 2012-11-05 20:48:50 +01:00
Diego Biurrun 930e26a3ea x86: h264qpel: Only define mmxext QPEL functions if H264QPEL is enabled 
This fixes compilation with --disable-everything and components enabled.
 2012-11-05 20:48:43 +01:00
Michael Niedermayer 30d27685b1 segment: fix null ptr deref 
Fixes CID732220
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 20:26:10 +01:00
Paul B Mahol 962314fe27 AVR demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-05 17:31:22 +00:00
Piotr Bandurski 8d88920578 dpcm: use AV_LOG_ERROR for error message. 2012-11-05 17:44:24 +01:00
Piotr Bandurski 461797f6aa riff: add "lsvm" FourCC for H263. 2012-11-05 17:43:01 +01:00
Michael Niedermayer b2b67fd610 docs/ffserver: document ffm/ffm2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 16:36:44 +01:00
Michael Niedermayer 9829ec1a9c ffm: redesign header format to make it extensible 
Currently FFM files generated with one versions of ffmpeg generally
cannot be read by another.
By spliting data into chunks, more fields can saftely be appended to
chunks as well as new chunks added.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 16:36:44 +01:00
Paul B Mahol 2a2d39c721 fate: add more pix_fmt tests for pam 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-05 14:59:31 +00:00