virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
36,748 Commits 37 Branches 400 Tags 463 MiB
a2c419848d
Commit Graph

36748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Diego Biurrun
54e68fb3b8 Merge some declarations and initializations. 
This fixes compilation failures related to START_TIMER/STOP_TIMER macros and
-Werror=declaration-after-statement.  START_TIMER declares variables and thus
may not be placed after statements outside of a new block.
 2012-01-04 01:28:28 +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
Diego Biurrun
9dec55748c cabac: drop unused and disabled get_cabac_u() / get_cabac_ueg() functions 2012-01-04 01:09:54 +01:00
Diego Biurrun
e451c26c5f cabac: drop unused STRICT_LIMITS code branch 2012-01-04 01:09:53 +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
Justin Ruggles
9785082c15 libspeexenc: fix pts calculations for more than 1 frame per packet 2012-01-03 18:56:41 -05:00
Justin Ruggles
730280f90d adxdec: clear eof flag and channel states when seeking 2012-01-03 18:47:42 -05:00
Justin Ruggles
3e57573fce fate: add ADX encoding/decoding test 2012-01-03 18:47:42 -05:00
Justin Ruggles
779ef255e6 adx: add an adx muxer 2012-01-03 18:47:42 -05:00
Justin Ruggles
754ebd1a5b adxenc: check output buffer size before writing 2012-01-03 18:47:42 -05:00
Justin Ruggles
1fb47728cd adxenc: use bytestream functions for header writing. 
also add more documentation about the header structure
 2012-01-03 18:47:42 -05:00
Justin Ruggles
656e606cae adxenc: use BLOCK_SIZE and BLOCK_SAMPLES macros 2012-01-03 18:47:42 -05:00
Justin Ruggles
f1be41c63d adxenc: use a loop to encode each channel 2012-01-03 18:47:42 -05:00
Justin Ruggles
6c117bd8e0 adxenc: remove unneeded loops 
avctx->frame_size is 32, so that is how many samples we process per call.
 2012-01-03 18:47:42 -05:00
Justin Ruggles
99baf2c7d0 adx: add AVFMT_GENERIC_INDEX to demuxer flags. 
fixes seeking
 2012-01-03 18:47:41 -05:00
Justin Ruggles
613668210b adxenc: avoid stereo deinterleaving 2012-01-03 18:47:41 -05:00
Justin Ruggles
6b77f07074 adxenc: remove unnecessary setting of coded_frame->key_frame. 
It is already set by avcodec_alloc_frame().
 2012-01-03 18:47:41 -05:00
Justin Ruggles
cc40c056d0 adxenc: log an error message and return AVERROR(EINVAL) for invalid channels 2012-01-03 18:47:41 -05:00
Justin Ruggles
a85ab8ad45 adxenc: cosmetics: pretty-printing 2012-01-03 18:47:41 -05:00
Justin Ruggles
25edfc88e3 adxenc: change some data types 2012-01-03 18:47:41 -05:00
Justin Ruggles
c98c6e18d8 adxenc: remove unneeded log message 2012-01-03 18:47:41 -05:00
Justin Ruggles
e3d4f59f95 adxenc: remove unneeded comments 2012-01-03 18:47:41 -05:00
Jonathan Nieder
96d8e18a98 APIchanges: mention cleaned up header includes 
Fixes bug 188.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2012-01-04 00:29:55 +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