virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
40,987 Commits 37 Branches 400 Tags 464 MiB
d0ad91c258
Commit Graph

40987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
d0ad91c258 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  os_support: Define SHUT_RD, SHUT_WR and SHUT_RDWR on OS/2
  http: Add support for reading http POST reply headers
  http: Add http_shutdown() for ending writing of posts
  tcp: Allow signalling end of reading/writing
  avio: Add a function for signalling end of reading/writing
  lavfi: fix comment, audio is supported now.
  lavfi: fix incorrect comment.
  lavfi: remove avfilter_null_* from public API on next bump.
  lavfi: remove avfilter_default_* from public API on next bump.
  lavfi: deprecate default config_props() callback and refactor avfilter_config_links()
  avfiltergraph: smarter sample format selection.
  avconv: rename transcode_audio/video to decode_audio/video.
  asyncts: reset delta to 0 when it's not used.
  x86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code.
  dwt: return errors from ff_slice_buffer_init()

Conflicts:
	ffmpeg.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/formats.c
	libavfilter/version.h
	libavfilter/vf_blackframe.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_format.c
	libavfilter/vf_showinfo.c
	libavfilter/video.c
	libavfilter/video.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-23 21:48:31 +02:00
Michael Niedermayer
d0f78e77e1 avidec: simplify avi_read_idx1() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-23 19:49:25 +02:00
Michael Niedermayer
212f129fb8 avidec: discard 0 packets even for sample_size==0 NI 
Fixes Ticket1332

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-23 19:04:23 +02:00
Michael Niedermayer
3cb83b225e xsubdec: print frame size when too small 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-23 19:04:23 +02:00
Michael Niedermayer
121d3875b6 lavf: print the invalid tb in avpriv_set_pts_info() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-23 19:04:23 +02:00
Carl Eugen Hoyos
5e268633d1 Do not leak extradata when encoding avui. 2012-05-23 16:48:40 +02:00
Carl Eugen Hoyos
fb6c6b15d7 avuienc: Use field_order to determine if a stream is interlaced. 2012-05-23 16:36:53 +02:00
Carl Eugen Hoyos
7a0d00dc79 Fix compilation with --disable-everything --enable-demuxer=ogg (--disable-yasm). 2012-05-23 16:09:48 +02:00
Carl Eugen Hoyos
9ddc47227d Fix compilation with --disable-everything --enable-demuxer=flac (--disable-yasm). 2012-05-23 16:04:22 +02:00
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
Dave Yeo
3f9d6e4239 os_support: Define SHUT_RD, SHUT_WR and SHUT_RDWR on OS/2 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-23 10:38:14 +03: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
Samuel Pitoiset
e5773d8bc3 http: Add support for reading http POST reply headers 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-22 23:16:46 +03:00
Samuel Pitoiset
ba354a8cc0 http: Add http_shutdown() for ending writing of posts 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-22 23:16:44 +03:00
Samuel Pitoiset
4a9ca93556 tcp: Allow signalling end of reading/writing 
tcp_shutdown() isn't needed at the moment, but is added for
consistency to explain how the function is supposed to be used.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-22 23:16:42 +03:00
Samuel Pitoiset
32d545e0a4 avio: Add a function for signalling end of reading/writing 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-22 23:16:41 +03:00
Anton Khirnov
0ce4a627c9 lavfi: fix comment, audio is supported now. 2012-05-22 21:37:44 +02:00
Anton Khirnov
ce353a881f lavfi: fix incorrect comment. 
poll_frame()/request_frame() are used for audio too.
 2012-05-22 21:37:44 +02:00
Anton Khirnov
c04c533f62 lavfi: remove avfilter_null_* from public API on next bump. 
Those functions are only useful inside filters. It is better to not
support user filters until the API is more stable.
 2012-05-22 21:36:23 +02:00
Anton Khirnov
43c7a01e98 lavfi: remove avfilter_default_* from public API on next bump. 
Those functions are only useful inside filters. It is better to not
support user filters until the API is more stable.
 2012-05-22 21:33:26 +02:00
Mina Nagy Zaki
88c3b87bd8 lavfi: deprecate default config_props() callback and refactor avfilter_config_links() 
Link properties have to be checked after config_props() is called to
make sure everything is sane, so the default config_props() for output
links was redundant.

Remove now empty defaults.c

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-05-22 21:32:57 +02:00
Anton Khirnov
ccefa89f39 avfiltergraph: smarter sample format selection. 2012-05-22 21:29:36 +02:00
Anton Khirnov
0629f6128e avconv: rename transcode_audio/video to decode_audio/video. 
Those functions do only decoding now, encoding is run from
poll_filters().
 2012-05-22 21:29:06 +02:00
Anton Khirnov
f297dd3812 asyncts: reset delta to 0 when it's not used. 
Fixes an invalid write.
 2012-05-22 21:28:20 +02:00
Justin Ruggles
713548cbad x86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code. 
This is needed for older versions of yasm/nasm that do not support AVX.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-05-22 20:46:02 +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
Diego Biurrun
cc7fac9970 dwt: return errors from ff_slice_buffer_init() 2012-05-22 14:01:56 +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