1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-20 06:16:02 +02:00
Commit Graph

11 Commits

Author SHA1 Message Date
05a267305d Support more codecs when muxing caf. 2011-08-22 09:35:58 +02:00
ef25e70de3 Stream-copying PureVoice into caf works fine. 2011-08-21 14:52:48 +02:00
9b60b076fb Support muxing MP1, MP2 and MP3 in caf. 2011-08-01 00:58:49 +02:00
c6e0332f30 Explicitely fail for unsupported codecs when muxing caf. 2011-08-01 00:58:49 +02:00
b35477a2f2 Use av_get_bits_per_sample() for mBitsPerChannel in caf. 2011-08-01 00:58:49 +02:00
88084eecdf Use little endian for caf codec tags. 2011-07-24 23:52:42 +02:00
45ecc7a294 Support adpcm_ima_wav and adpcm_ms in caf. 2011-07-12 17:35:20 +02:00
43e96d0466 Support gsm_ms in caf files. 2011-07-09 17:13:13 +02:00
976a8b2179 Merge remote-tracking branch 'qatar/master'
* qatar/master: (40 commits)
  H.264: template left MB handling
  H.264: faster fill_decode_caches
  H.264: faster write_back_*
  H.264: faster fill_filter_caches
  H.264: make filter_mb_fast support the case of unavailable top mb
  Do not include log.h in avutil.h
  Do not include pixfmt.h in avutil.h
  Do not include rational.h in avutil.h
  Do not include mathematics.h in avutil.h
  Do not include intfloat_readwrite.h in avutil.h
  Remove return statements following infinite loops without break
  RTSP: Doxygen comment cleanup
  doxygen: Escape '\' in Doxygen documentation.
  md5: cosmetics
  md5: use AV_WL32 to write result
  md5: add fate test
  md5: include correct headers
  md5: fix test program
  doxygen: Drop array size declarations from Doxygen parameter names.
  doxygen: Fix parameter names to match the function prototypes.
  ...

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavformat/flvenc.c
	libavformat/oggenc.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-04 00:45:21 +02:00
6d721f714e Fix ff_mov_write_chan() so it can be used by other muxers. 2011-05-17 01:47:12 +02:00
2c4ad1a37b Initial caf muxer. 2011-05-15 03:25:57 +02:00