RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
34,424 Commits 36 Branches 392 Tags 312 MiB
Commit Graph

34424 Commits

Author SHA1 Message Date
Michael Niedermayer 64a41dc21f proresenc: the encoder expects native endian input. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-30 02:55:01 +01:00
Michael Niedermayer 4dbce51b9e ffmpeg: allow pass 3 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-30 02:44:36 +01:00
Clément Bœsch ccc09185e4 doc: add v4l2 example with ALSA instead of OSS. 2011-10-30 02:07:38 +01:00
Clément Bœsch 6921272b23 lavd: add v4l and v4l2 aliases. 2011-10-30 02:39:30 +02:00
Clément Bœsch 41f00e4adb ffmpeg: silence two compiler warnings. 2011-10-30 02:35:34 +02:00
Clément Bœsch e1d613515b doc: fix and clarify libx264 encoding. 
tune, fastfirstpass and profile are not available through x264opts.
Since some FFmpeg options don't match the names used in libx264, add
libx264 option names as a reference when needed. And last thing, x264
don't have a manpage ATM, so prefer the x264 --fullhelp over the
unexistant manpage reference.
 2011-10-30 02:08:57 +02:00
Michael Niedermayer d17e7070a0 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (51 commits)
  cin audio: use sign_extend() instead of casting to int16_t
  cin audio: restructure decoding loop to avoid a separate counter variable
  cin audio: use local variable for delta value
  cin audio: remove unneeded cast from void*
  cin audio: validate the channel count
  cin audio: remove unneeded AVCodecContext pointer from CinAudioContext
  dsicin: fix several audio-related fields in the CIN demuxer
  flacdec: use av_get_bytes_per_sample() to get sample size
  dca: handle errors from dca_decode_block()
  dca: return error if the frame header is invalid
  dca: return proper error codes instead of -1
  utvideo: handle empty Huffman trees
  binkaudio: change short to int16_t
  binkaudio: only decode one block at a time.
  binkaudio: store interleaved overlap samples in BinkAudioContext.
  binkaudio: pre-calculate quantization factors
  binkaudio: add some buffer overread checks.
  atrac3: support float or int16 output using request_sample_fmt
  atrac3: add CODEC_CAP_SUBFRAMES capability
  atrac3: return appropriate error codes instead of -1
  ...

Conflicts:
	libavcodec/atrac1.c
	libavcodec/dca.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-30 01:33:41 +02:00
Michael Niedermayer 1af3571e05 mjpeg_parser: Rewrite to skip marker segments 
Based on code by Aaron Miller <amiller@atlasdigital.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-30 00:29:17 +02:00
Michael Niedermayer 429b3cd6f5 mjpeg_parser: add MJPEGParserContext 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-30 00:28:25 +02:00
Carl Eugen Hoyos 86931dc930 Bump libavformat minor version for the G.729 raw demuxer. 2011-10-30 00:03:00 +02:00
Carl Eugen Hoyos bc2814d848 Add G.729 raw demuxer. 2011-10-30 00:01:46 +02:00
Carl Eugen Hoyos 0387ad892c Be more verbose about unsupported H.264 bit-depths. 2011-10-29 23:41:05 +02:00
Justin Ruggles 7d1b17b833 cin audio: use sign_extend() instead of casting to int16_t 2011-10-29 16:43:40 -04:00
Justin Ruggles 405af43104 cin audio: restructure decoding loop to avoid a separate counter variable 
Also check output buffer size instead of truncating output.
 2011-10-29 16:43:40 -04:00
Justin Ruggles 859bdc33e4 cin audio: use local variable for delta value 2011-10-29 16:43:40 -04:00
Justin Ruggles 64e19ba48b cin audio: remove unneeded cast from void* 2011-10-29 16:43:40 -04:00
Justin Ruggles 03381c12b3 cin audio: validate the channel count 2011-10-29 16:43:40 -04:00
Justin Ruggles 664eb77dc3 cin audio: remove unneeded AVCodecContext pointer from CinAudioContext 2011-10-29 16:43:40 -04:00
Justin Ruggles 44d2a982ac dsicin: fix several audio-related fields in the CIN demuxer 
bits_per_coded_sample should be 8.
block_align is calculated incorrectly, but it is not needed anyway.
packet pts should be calculated in samples.
packet duration can be set.
 2011-10-29 16:43:40 -04:00
Vladimir Voroshilov 0fd59f1d45 Minimal patch for G.729 demuxer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-29 22:08:25 +02:00
Justin Ruggles 5bd0343bee flacdec: use av_get_bytes_per_sample() to get sample size 2011-10-29 16:05:25 -04:00
Justin Ruggles 272fcc32bb dca: handle errors from dca_decode_block() 
Return error if core block decoding fails.
Do not enable XCh if XCh extension block decoding fails.
 2011-10-29 16:04:07 -04:00
Justin Ruggles aae6eead6a dca: return error if the frame header is invalid 2011-10-29 16:04:07 -04:00
Justin Ruggles f44059d260 dca: return proper error codes instead of -1 2011-10-29 16:04:06 -04:00
Kostya Shishkov 46e1af3b0f utvideo: handle empty Huffman trees 
If the frame is filled with the same colour, encoder may produce no data
and the fill value is indicated by zero code length (the rest of symbols
will have 0xFF for code length, meaning invalid).  So such Huffman trees
should be treated specially.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-10-29 12:54:08 -07:00
Justin Ruggles 425a843505 binkaudio: change short to int16_t 2011-10-29 15:16:54 -04:00
Justin Ruggles 4f4e19480a binkaudio: only decode one block at a time. 
This prevents truncating output due to an output buffer that is too small for
all blocks. There is no limit on the number of blocks in a packet.
 2011-10-29 15:16:54 -04:00
Justin Ruggles eaddd29e00 binkaudio: store interleaved overlap samples in BinkAudioContext. 
This fixes the requirement for the buffer size to be larger than the number of
samples actually decoded.
 2011-10-29 15:16:54 -04:00
Justin Ruggles 9f48039a37 binkaudio: pre-calculate quantization factors 2011-10-29 15:16:53 -04:00
Justin Ruggles 101ef19ef4 binkaudio: add some buffer overread checks. 
This stops decoding before overreads instead of after.
 2011-10-29 15:16:53 -04:00
Justin Ruggles 2073224697 atrac3: support float or int16 output using request_sample_fmt 2011-10-29 15:06:32 -04:00
Justin Ruggles a047851329 atrac3: add CODEC_CAP_SUBFRAMES capability 
the decoder can handle multiple frames in a packet
 2011-10-29 15:06:32 -04:00
Justin Ruggles 8f98577d4d atrac3: return appropriate error codes instead of -1 2011-10-29 15:06:32 -04:00
Justin Ruggles 47b617021d atrac3: make sure all memory is freed on init failure 2011-10-29 15:06:32 -04:00
Justin Ruggles c91613857d atrac3: add a couple macro constants 2011-10-29 15:06:31 -04:00
Justin Ruggles 1fead73d7b atrac3: return error if packet is too small 2011-10-29 15:06:31 -04:00
Justin Ruggles 7e4881a2d0 atrac3: check output buffer size before decoding 2011-10-29 15:06:31 -04:00
Justin Ruggles 6ba7f78bbb atrac3: use separate pointers for each channel in decodeFrame() 2011-10-29 15:06:31 -04:00
Justin Ruggles 5e76b8bb76 atrac3: use optimized float_interleave() function for stereo interleaving 2011-10-29 15:06:31 -04:00
Justin Ruggles 8af33cb38a atrac3: decode mono directly to the output buffer 2011-10-29 15:06:31 -04:00
Justin Ruggles c4a6fde33f atrac3: decode output to float samples instead of converting to s16 2011-10-29 15:06:31 -04:00
Justin Ruggles f20dd574f1 atrac1: return appropriate error codes instead of -1 2011-10-29 15:06:31 -04:00
Justin Ruggles 6dc7dd7af4 atrac1: check for ff_mdct_init() failure 2011-10-29 15:06:31 -04:00
Justin Ruggles 21dcecc310 atrac1: use optimized float_interleave() function for stereo interleaving 2011-10-29 15:06:31 -04:00
Justin Ruggles 96b5702efe atrac1: fix a typo 2011-10-29 15:06:31 -04:00
Justin Ruggles bff5b2c1ca atrac1: validate number of channels 2011-10-29 15:06:31 -04:00
Justin Ruggles 9a35ff3841 atrac1: decode mono audio directly to output buffer 
For stereo we need to use intermediate planar buffers, but mono does not need
to be deinterleaved so the output buffer can be used directly.
 2011-10-29 15:06:31 -04:00
Justin Ruggles 33684b9c12 atrac1: check output buffer size before decoding 2011-10-29 15:06:30 -04:00
Justin Ruggles 5c353eb8e3 cook: return AVERROR_PATCHWELCOME instead of ENOTSUP 
ENOTSUP is not defined on some systems
 2011-10-29 14:32:55 -04:00
Michael Niedermayer e71aaad283 ffmpeg: Fix regression where various fields where not initialized leading to segfaults 
Bug introduced by:
commit f12f40b31a
Author: Anton Khirnov <anton@khirnov.net>
Date:   Tue Aug 30 04:05:20 2011 +0200

    ffmpeg: get rid of new* options.

    They are confusing, irregular and redundant -- -map already contains all
    the information.  Stream maps can now be parsed in opt_output_file().

    Add a more user-friendly default behavior in case no maps are present.

    Breaks -programid for now, but it never worked properly anyway. A better
    solution will be written soon.
 2011-10-29 20:25:39 +02:00