virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
40,963 Commits 37 Branches 400 Tags 460 MiB
0da28d689c
Commit Graph

40963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas George
0da28d689c af_amerge: compute output timestamp. 
Use the timestamps from the first input.
 2012-05-23 14:56:51 +02:00
Nicolas George
e6aee46760 af_amerge: set samples rate in query_formats. 2012-05-23 14:56:50 +02:00
Michael Niedermayer
e15f1286e6 ffv1: fix decoder state_transition table 
This fixes a regression with ffv1.1 coder=1 decoding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-23 12:04:10 +02:00
Michael Niedermayer
60c950ac08 dwt: use av_freep() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-22 23:58:46 +02:00
Michael Niedermayer
ea5dab58e0 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dwt: check malloc calls
  ppc: Drop unused header regs.h
  af_resample: remove an extra space in the log output
  Convert vector_fmul range of functions to YASM and add AVX versions
  lavfi: add an audio split filter
  lavfi: rename vf_split.c to split.c

Conflicts:
	doc/filters.texi
	libavcodec/ppc/regs.h
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/f_split.c
	libavfilter/split.c
	libavfilter/version.h
	libavfilter/vf_split.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-22 23:42:17 +02:00
Michael Niedermayer
841c1be57e swr: check return value of swr_inject_silence/drop_output. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-22 20:37:12 +02:00
Michael Niedermayer
d9b92980c9 libvorbis: only store version string if bitexact is not set. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-22 20:37:12 +02:00
Michael Niedermayer
a645049bd8 swr: check count argument of realloc_audio() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-22 20:37:12 +02:00
Carl Eugen Hoyos
50858a64bf Add Avid Meridien Uncompressed (AVUI) encoder. 2012-05-22 20:33:24 +02:00
Matthieu Bouron
f452d6c34d mxfdec: fix frame height computation for mixed fields layout 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-22 15:04:59 +02:00
Robert Nagy
965b807278 vf_yadif: Fixed potential access violation on EOF. 
The correct invariant is (cur != NULL -> next != NULL). Not the other way around.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-22 14:59:27 +02:00
Michael Niedermayer
1dd71e1cd5 rawdec: force timestamps from codec to be used 
This fixes playback timing with at least m4v files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-22 14:59:02 +02:00
Michael Niedermayer
035f6620ce mpeg4videoparser: support using timestamps from codec. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-22 14:59:02 +02:00
Michael Niedermayer
a6b3471c44 avformat: add needs_parsing type to enable codec TS use. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-22 14:59:02 +02:00
Michael Niedermayer
696452e4c5 avcodec: add parser flag to indicate that codec TS are the only available and should be used 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-22 14:59:02 +02:00
Paul B Mahol
672f8226bb shorten: fix lossy decoding 
Closes #1299, #1300 and #1301.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-05-22 11:56:18 +00:00
Jordi Ortiz
c89e428ed8 dwt: check malloc calls 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-05-22 13:27:06 +02:00
Diego Biurrun
3ea5429489 ppc: Drop unused header regs.h 2012-05-22 11:54:53 +02:00
Stefano Sabatini
27127ebe6c doc: add syntax.texi file 2012-05-22 00:39:53 +02:00
Justin Ruggles
e0d8427dce af_resample: remove an extra space in the log output 2012-05-21 18:26:51 -04:00
Michael Niedermayer
938adb7abc Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dwt: K&R prettyprinting cosmetics
  Remove libnut wrapper
  fate: change name of FATE samples location environment variable
  avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps.
  http: Factorize the code by adding http_read_header()

Conflicts:
	configure
	doc/APIchanges
	doc/fate.texi
	libavcodec/dwt.c
	libavcodec/dwt.h
	libavformat/Makefile
	libavformat/avformat.h
	libavformat/libnut.c
	libavformat/matroskaenc.c
	libavformat/utils.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-21 23:53:39 +02:00
Kieran Kunhya
5ff01259a8 Convert vector_fmul range of functions to YASM and add AVX versions 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-05-21 17:13:05 -04:00
Michael Niedermayer
faa2930f19 flvdec: reenable extradata passing code 
This fixes passing junk in stream.
It should not have any user vissible effect.
We are discarding the new data in the decoder as no case is known
where it is needed but it causes problems if used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-21 21:19:43 +02:00
Justin Ruggles
afeb3590fc lavfi: add an audio split filter 
Based on current version of the asplit filter in FFmpeg written by
Stefano Sabatini and others.
 2012-05-21 14:49:52 -04:00
Justin Ruggles
cc30080b3f lavfi: rename vf_split.c to split.c 
This is in preparation for adding an audio split filter.
 2012-05-21 14:49:52 -04:00
Michael Niedermayer
a6f650af8d aac: fix SCE in stereo case, this is surprisingly actually needed 
Fixes Ticket513

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-21 20:43:00 +02:00
Michael Niedermayer
a3710f1ebb aacdec: print debug note when unexpected SCE/CPE is encountered 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-21 20:34:32 +02:00
Michael Niedermayer
3230590c5d libavcodec: fix side data split with 0 sized packets 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-21 20:34:32 +02:00
Michael Niedermayer
a1bb0823a9 libavcodec: correct consumed bytes for decoders 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-21 20:34:32 +02:00
Michael Niedermayer
307562be98 mpeg4videodec: print more debug info for debug_pict_info 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-21 14:56:12 +02:00
Michael Niedermayer
8258697c49 ivi_common: skip null frames for all indeo variants 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-21 14:56:12 +02:00
Jordi Ortiz
13a867a63e dwt: K&R prettyprinting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-05-21 11:14:49 +02:00
Stefano Sabatini
6374ee72df ffprobe: remove ad-hoc behavior when nb_fmt_entries_to_show is 1 
The special-case behavior may complicate parsing when the
-show_format_entry option is used programmatically in a script.

The option default=nk=1 achieves the same purpose, if the objective is to
skip printing the single field key.
 2012-05-21 10:32:25 +02:00
Stefano Sabatini
3853e1d94e doc/ffprobe: document that ffprobe.xsd can be retrieved at a certain ffmpeg.org url 
Address trac ticket #1265.
 2012-05-21 10:32:08 +02:00
Diego Biurrun
db9e00f469 Remove libnut wrapper 
libnut is unmaintained and known to be buggy; native NUT code exists.
 2012-05-21 08:51:50 +02:00
Diego Biurrun
9309bdfe2c fate: change name of FATE samples location environment variable 
FATE_SAMPLES is now used directly by the Makefiles, which induces the test
system to run a test with the value of the environment variable as name.
Renaming the environment variable to LIBAV_SAMPLES avoids this problem.
 2012-05-21 08:51:49 +02:00
James Zern
e9cef89702 avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps. 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-05-20 19:50:32 -04:00
Michael Niedermayer
349c62410b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  indeo: Make ivi_calc_band_checksum() static, it is only used in one file.
  indeo: Drop unused debug function ivi_check_band().
  avcodec/utils: cast a function argument to shut up a compiler warning
  truemotion1: remove disabled code
  fix typo in comment
  fate: fix dependencies for non-SAMPLES avconv tests
  indeo: check for invalid motion vectors
  indeo: check that band output buffer exists
  indeo: clear allocated band buffers
  indeo: track tile macroblock size
  indeo: check custom Huffman tables for errors
  factor out common decoding code for Indeo 4 and Indeo 5
  mp3: fix start band index for block type 2 in 8kHz audio
  lavf: change some (de)muxer names to lowercase
  lavf: make output format matching case insensitive

Conflicts:
	libavcodec/indeo4.c
	libavcodec/indeo5.c
	libavcodec/ivi_common.c
	libavcodec/utils.c
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 22:58:04 +02:00
Matthieu Bouron
432fe9a38a ffmpeg: fix a crash with complex filters when pix_fmt is not specified 
ffmpeg -i in.mxf -filter_complex "[0:0]fieldorder=tff" out.wav will
fail with an error message instead of crashing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 19:36:00 +02:00
Michael Niedermayer
318e395764 ffmpeg: drop get_sync_ipts() and drop related special case for video 
Idea found in a commit from Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 19:36:00 +02:00
Marton Balint
b36a0a80fc lavf: also use codec aspect ratio in av_guess_sample_aspect_ratio 
Use codec aspect ratio for frame aspect ratio if AVFrame is NULL.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 19:36:00 +02:00
Samuel Pitoiset
5d603f1b65 http: Factorize the code by adding http_read_header() 
This function is used for reading http reply headers.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-20 20:20:50 +03:00
Nicolas George
4a5d18b6e2 vsrc_mandelbrot: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
dc6a02de01 vsrc_life: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
ca554fbc2f vsrc_cellauto: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
2987efe9ba vf_ass: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
5732f40e3f x11grab: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
3e63071115 v4l2: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
0ef4924db4 sdl: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
9bcd70aa23 bktr: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00