RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
36,429 Commits 36 Branches 398 Tags 242 MiB
Commit Graph

36429 Commits

Author SHA1 Message Date
Clément Bœsch 837126568c doc: use @code{} for --{enable,disable}-options. 2012-01-04 13:21:08 +01:00
Michael Niedermayer 15b219fae9 jpegdec: Fix vlc table check for progressive jpegs. 
Fixes Ticket834

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-04 05:03:15 +01:00
Michael Niedermayer 6072a19b4f lavf: Fix try_decode_frame() so it doesnt loop infinitely. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-04 04:08:46 +01:00
Michael Niedermayer f37174bc19 electronicarts: Pass error through ea_read_header(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-04 04:02:22 +01:00
Oana Stratulat 0d3a51e5d2 electronicarts: Fix division by zero. Fixes Ticket #793 
Signed-off-by: Oana Stratulat <oanaandreeastratulat@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-04 02:39:49 +01:00
Michael Niedermayer ad1c8dd673 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: add dxtory test
  adx_parser: rewrite.
  adxdec: Validate channel count to fix a division by zero.
  adxdec: Do not require extradata.
  cmdutils: K&R reformatting cosmetics
  alacdec: implement the 2-pass prediction type.
  alacenc: implement the 2-pass prediction type.
  alacenc: do not generate invalid multi-channel ALAC files
  alacdec: fill in missing or guessed info about the extradata format.
  utvideo: proper median prediction for interlaced videos
  lavu: bump lavu minor for av_popcount64
  dca: K&R formatting cosmetics
  dct: K&R formatting cosmetics
  lavf: flush decoders in avformat_find_stream_info().
  win32: detect number of CPUs using affinity
  Add av_popcount64
  snow: Restore three mistakenly removed casts.

Conflicts:
	cmdutils.c
	doc/APIchanges
	libavcodec/adx_parser.c
	libavcodec/adxdec.c
	libavcodec/alacenc.c
	libavutil/avutil.h
	tests/fate/screen.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-04 01:12:34 +01:00
Stefano Sabatini d6da16dca5 ffprobe: add support to option -show_error 2012-01-04 01:06:28 +01:00
Stefano Sabatini 55ed19bf3b ffprobe: remove unused variable in show_format() 2012-01-04 01:06:11 +01:00
Stefano Sabatini 4c5c0609c1 ffprobe: reindent after the last commit 2012-01-04 01:06:03 +01:00
Stefano Sabatini 90347dabc8 ffprobe: change order of operations in probe_file() 
This is required by a pending patch, also fixes a memleak due to the
writer context not being closed in case of open_input_file() failure.
 2012-01-04 01:05:56 +01:00
Stefano Sabatini c972f91d5b ffprobe: prefer av_log to fprintf(stderr) 2012-01-04 01:05:51 +01:00
Michael Niedermayer 6429269096 wmall: remove ;; 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 23:52:28 +01:00
Michael Niedermayer dde545c697 Merge remote-tracking branch 'shariman/wmall' 
* shariman/wmall:
  Fix audio output
  Suppress dumping of residues buffer
  Use quantizer value read from bitstream
  Cosmetics: Remove two empty lines and realign some code
  Reset acfilter_prevvalues buffer in clear_codec_buffers()
  Fix AC filter buffers and AC filter reversion

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 23:45:48 +01:00
Oana Stratulat fd16f56798 fate: add dxtory test 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2012-01-03 23:16:29 +01:00
Carl Eugen Hoyos 001567c767 Set bits_per_coded_sample when encoding Y41P. 
This allows mplayer -vc bt411 to decode files
encoded with FFmpeg.

Reviewed-by: Paul B Mahol
 2012-01-03 23:05:54 +01:00
Jean First efaf448888 rtsp: Fix compiler warning for uninitialized variable. 
Reviewed-by: Martin Storsjö
 2012-01-03 23:01:28 +01:00
Michael Niedermayer b024209b1f adx_parser: rewrite. 
The previous code ended in multiple different infinite
loops. See stl_ten_1_big.sfd as example with and without zzuf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-01-03 16:28:17 -05:00
Justin Ruggles 6fd075f180 adxdec: Validate channel count to fix a division by zero. 2012-01-03 16:28:17 -05:00
Michael Niedermayer 4f1a787744 adxdec: Do not require extradata. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-01-03 16:28:17 -05:00
Aneesh Dogra cbaef7d16e cmdutils: K&R reformatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-01-03 21:10:09 +01:00
Justin Ruggles e49d21306a alacdec: implement the 2-pass prediction type. 
The reference encoder does not generate any streams using this, but the
reference decoder can handle it, so we should as well.
 2012-01-03 13:15:24 -05:00
Justin Ruggles bb63475aec alacenc: implement the 2-pass prediction type. 
This isn't used by the reference encoder, but it is supported by the decoder.
 2012-01-03 13:15:23 -05:00
Justin Ruggles 149e1b0468 alacenc: do not generate invalid multi-channel ALAC files 2012-01-03 13:15:23 -05:00
Justin Ruggles e76c7b856f alacdec: fill in missing or guessed info about the extradata format. 
Now that there is official documentation from Apple about this, we don't have
to guess anymore.
 2012-01-03 13:15:23 -05:00
Kostya Shishkov 490dcda6b6 utvideo: proper median prediction for interlaced videos 2012-01-03 17:08:49 +01:00
Janne Grunau c04a954da6 lavu: bump lavu minor for av_popcount64 
Add it to doc/APIchanges and update and correct other entries.
 2012-01-03 15:42:26 +01:00
Shitiz Garg f37b4efe03 dca: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-01-03 15:25:54 +01:00
Aneesh Dogra 2e70b2de58 dct: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-01-03 15:25:51 +01:00
Anton Khirnov 212fd3a1f1 lavf: flush decoders in avformat_find_stream_info(). 
This means that avformat_find_stream_info() now works properly with
multiple threads, so there's no need to force thread count to 1.
 2012-01-03 14:58:21 +01:00
Daniel Verkamp 02e8f4272c win32: detect number of CPUs using affinity 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2012-01-03 14:25:57 +01:00
Daniel Verkamp b73ec05473 Add av_popcount64 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2012-01-03 14:25:43 +01:00
Piotr Bandurski 912e75169b Support 8bpp grayscale Sun Rasterfile images. 
Fixes ticket #865.
 2012-01-03 13:24:50 +01:00
Diego Biurrun 418f066f8c snow: Restore three mistakenly removed casts. 2012-01-03 10:27:45 +01:00
Michael Bradshaw 2ba3416362 Added yuva420p decoding support for libopenjpeg 
Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 06:21:01 +01:00
Michael Bradshaw 3f07ef1dff Added RGBA and YUV440 decoding support for libopenjpeg decoder 
Reviewed-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 06:19:21 +01:00
Michael Bradshaw d1669e5fe3 Fixed openjpeg decoding bug with width/linesize issue 
The original code wasn't taking into account the fact that linesize may not equal the frame's width.  This is to correct that.

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 06:15:33 +01:00
Paul B Mahol 69d766daa0 lavc: replace rest of deprecated SAMPLE_FMT_* with AV_SAMPLE_FMT_* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 04:00:52 +01:00
Paul B Mahol 7099f36578 lavc: replace rest of deprecated FF_*_TYPE with AV_PICTURE_TYPE_* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 03:25:22 +01:00
Jean First 12bdc7b15e ffmpeg: fix compiler warning for uninitialized variables 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 03:24:18 +01:00
Jean First f2eb2e5c4f wtvdec: use intfloat.h instead of intfloat_readwrite.h 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 03:23:58 +01:00
Jean First 535705a489 ffmpeg: use avformat_close_input instead of av_close_input_file 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 03:19:03 +01:00
Jean First f86c348d46 vp3: remove redeclaration of vp3_decode_flush 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 03:16:42 +01:00
Michael Niedermayer 7d8f115843 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegenc: use avctx->slices as number of slices
  v410enc: fix undefined signed left shift caused by integer promotion
  Release notes: mention cleaned up header includes
  fix Changelog file
  Fix a bunch of typos.
  Drop some pointless void* return value casts from av_malloc() invocations.
  wavpack: fix typos in previous cosmetic clean-up commit
  wavpack: cosmetics: K&R pretty-printing
  avconv: remove the 'codec framerate is different from stream' warning
  wavpack: determine sample_fmt before requesting a buffer
  bmv audio: implement new audio decoding API
  mpegaudiodec: skip all channels when skipping granules
  mpegenc: simplify muxrate calculation

Conflicts:
	Changelog
	avconv.c
	doc/RELEASE_NOTES
	libavcodec/h264.c
	libavcodec/mpeg12.c
	libavcodec/mpegaudiodec.c
	libavcodec/mpegvideo.c
	libavformat/mpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 03:06:45 +01:00
Mashiat Sarker Shakkhar 2083a10abf Fix audio output 
Up until now, the decoder didn't output anything
in the data buffer. This fixes all the issues
related to sample format, removes leftover code
and actually outputs some audio to data buffer.

With this, the only sample we have can be played.
Seeking is still broken though.
 2012-01-03 01:51:36 +06:00
Mashiat Sarker Shakkhar f7166f7d8d Suppress dumping of residues buffer 2012-01-03 01:51:17 +06:00
Janne Grunau 881a5e047d mpegenc: use avctx->slices as number of slices 
Adds a new member to MpegEncContext to hold the number of used slice
contexts. Fixes segfaults with '-threads 17 -thread_type slice' and
fate-vsynth{1,2}-mpeg{2,4}thread{,_ilace} with --disable-pthreads.
 2012-01-02 19:20:23 +01:00
Janne Grunau 264808219d v410enc: fix undefined signed left shift caused by integer promotion 2012-01-02 19:20:23 +01:00
Michael Niedermayer 45552371e3 jpegdec: non interleaved rgb ljpeg support. 
Fixes Ticket856

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-02 19:06:46 +01:00
Michael Niedermayer 465eb0eb48 jpegdec: 9-16 bit yuv/gray ljpeg support. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-02 17:53:41 +01:00
Michael Niedermayer 24964f21e4 jpegdec: Only enable rgb mode when there are 3 components. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-02 17:53:40 +01:00