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
46,784 Commits 37 Branches 400 Tags 460 MiB
4c0aece192
Commit Graph

3032 Commits

Author SHA1 Message Date
Michael Niedermayer
e13d5e9a4b Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2' 
* commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2':
  x86: h264_weight_10bit: port to cpuflags
  libtheoraenc: add missing pixdesc.h header
  avcodec: remove ff_is_hwaccel_pix_fmt
  pixdesc: add av_pix_fmt_get_chroma_sub_sample
  hlsenc: stand alone hls segmenter

Conflicts:
	doc/muxers.texi
	libavcodec/ffv1enc.c
	libavcodec/imgconvert.c
	libavcodec/mpegvideo_enc.c
	libavcodec/tiffenc.c
	libavformat/Makefile
	libavformat/allformats.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-14 11:59:20 +01:00
Georg Lippitsch
15b02ddee0 Update iec61883 to handle multiple devices, and allow 
selection of DV device by its GUID
 2012-11-13 19:44:21 +01:00
Paul B Mahol
1acd2f6ba7 Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h 
Also remove it in once case when it is not needed.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-13 13:21:21 +00:00
Stefano Sabatini
7945665200 lavfi: store and propagate number of channels information in audio buffer properties 
The channels field is required since the channel layout is not always
available.
 2012-11-13 12:15:27 +01:00
Stefano Sabatini
9d2a7c0481 doc/encoders: document libtheora encoder 2012-11-13 12:15:23 +01:00
Luca Barbato
22a0827dff hlsenc: stand alone hls segmenter 
Simplifies usage but has higher latency.
 2012-11-13 01:37:05 +01:00
Michael Niedermayer
03b078721c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
  doc: git-howto: Leave reviewers time to react before pushing patches
  Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
  lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/git-howto.texi
	ffmpeg_filter.c
	libavcodec/flacdec.c
	libavcodec/imc.c
	libavcodec/mpegaudiodec.c
	libavcodec/utils.c
	libavfilter/asrc_anullsrc.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/buffer.c
	libavutil/Makefile
	libavutil/audioconvert.h
	libavutil/channel_layout.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-12 11:32:11 +01:00
Clément Bœsch
3a7f00810c lavfi: remove mp=geq filter. 
Native geq video filter is now available.
 2012-11-11 23:18:12 +01:00
Clément Bœsch
8eecbaf5e4 lavfi: add geq filter. 2012-11-11 23:12:54 +01:00
Clément Bœsch
2b3597f0d1 lavfi: remove mp=fixpts filter. 
lavfi/f_setpts.c should allow everything mp=fixpts supports, with a lot
of additional control.
 2012-11-11 22:49:53 +01:00
Clément Bœsch
84aed3faf0 lavfi: remove mp=tile filter. 
The native tile video filter is now feature equivalent.
 2012-11-11 22:43:18 +01:00
Clément Bœsch
11ed12c256 doc/filters: complete tile documentation. 2012-11-11 22:43:18 +01:00
Diego Biurrun
97bf7c03b1 doc: git-howto: Leave reviewers time to react before pushing patches 2012-11-11 20:43:28 +01:00
Justin Ruggles
a903f8f087 Include libavutil/channel_layout.h instead of libavutil/audioconvert.h 
Also reorder some other #include when applicable.
 2012-11-11 13:35:12 -05:00
Justin Ruggles
5980f5dd18 lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h 2012-11-11 13:35:12 -05:00
Stefano Sabatini
c0aff4064d doc/Makefile: generate library headers with the correct section number 2012-11-11 14:06:27 +01:00
Stefano Sabatini
514910fb2d doc: add libavfilter.texi 
With some re-wording by Alexander Strasser <eclipse7@gmx.net>.
 2012-11-11 11:15:53 +01:00
Stefano Sabatini
598546e1df doc: add libavutil.texi 
With some fixes and better wording by Alexander Strasser
<eclipse7@gmx.net>.
 2012-11-11 11:15:53 +01:00
Nicolas George
aeb4d27dec doc/faq: explain libfoo-dev packages. 2012-11-08 21:05:10 +01:00
Nicolas George
d55911adc8 doc/faq: replace @file by @command for "ffmpeg". 2012-11-07 23:45:12 +01:00
Alexander Strasser
4ccfcc8a0b doc/libavcodec: hint to where to find the Git history 
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
 2012-11-07 23:33:31 +01:00
Stefano Sabatini
58d1d7024d doc/Makefile: change DOCLIBS check 
More consistent with the rest of the build system, and more compact.
 2012-11-07 23:18:11 +01:00
Stefano Sabatini
a1934daeb4 doc/Makefile: remove .3 file with make clean 2012-11-06 12:23:13 +01:00
Alexander Strasser
98506e16c7 doc/libavcodec: do not say multimedia streams in the title 
The mention of multimedia stream sounds more like multiple
elementary media streams like video and audio multiplexed
into a multimedia container format.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2012-11-06 11:55:37 +01:00
Alexander Strasser
23b57b0203 doc/libavcodec: improve wording in description 
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2012-11-06 11:55:29 +01:00
Stefano Sabatini
d658f9a1cb doc/ffserver: fix typos/reword paragraphs about FFM versions 2012-11-06 11:35:14 +01:00
Stefano Sabatini
e8c0b6710c examples/muxing: fix typo: allocated -> allocate 2012-11-06 11:28:28 +01:00
Stefano Sabatini
7f6f8f642c examples/demuxing: fix braino 
s/video/audio/ in a log message.
 2012-11-06 01:10:12 +01:00
Stefano Sabatini
794cea588c examples/demuxing: dump input information *after* trying to open audio stream 
Implement more logical code flow.
 2012-11-06 01:10:12 +01:00
Michael Niedermayer
7d26be63c2 Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e' 
* commit '5ff998a233d759d0de83ea6f95c383d03d25d88e':
  flacenc: use uint64_t for bit counts
  flacenc: remove wasted trailing 0 bits
  lavu: add av_ctz() for trailing zero bit count
  flacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian
  fate: aac: Place LATM tests and general AAC tests in different groups
  build: The A64 muxer depends on rawenc.o for ff_raw_write_packet()

Conflicts:
	doc/APIchanges
	libavutil/version.h
	tests/fate/aac.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 22:51:20 +01:00
Justin Ruggles
dfde8a34e5 lavu: add av_ctz() for trailing zero bit count 2012-11-05 15:32:29 -05:00
Paul B Mahol
962314fe27 AVR demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-05 17:31:22 +00:00
Michael Niedermayer
b2b67fd610 docs/ffserver: document ffm/ffm2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-05 16:36:44 +01:00
Stefano Sabatini
008ace3524 doc/libavcodec: apply misc minor typo fixes 2012-11-04 18:01:16 +01:00
Stefano Sabatini
617d0d41a2 doc: add libavcodec.texi 
The option chapter is based on the avoptions_codec.texi auto-generated
file.
 2012-11-04 11:54:57 +01:00
Nicolas George
1fa47f8dea cmdutils: allow to set the report file name. 
The file name can be set by setting the FFREPORT environment
variable to "file=something".

Fix trac ticket #1823.
 2012-11-04 10:52:43 +01:00
Nicolas George
3bdf4971ba lavu/opt: implement av_opt_get_key_value(). 
This function does the low-level work of av_opt_set_from_string()
but can be used when there is no option context or when a generic
handling of unknown keys is needed.

av_opt_set_from_string() is changed to make use of it.
 2012-11-04 10:47:52 +01:00
Nicolas George
73180ecd0a doc/faq: make the -sameq question more explicit. 
Wording suggested by Stefano Sabatini, should have been
merged with the previous commit.
 2012-11-03 17:13:44 +01:00
Nicolas George
8cf6377ac1 doc/faq: explain why -sameq is gone. 2012-11-03 17:03:13 +01:00
Michael Niedermayer
2581d9bcbb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: add apidoc target for doxygen API documentation
  matroskadec: do not use avpacket internals

Conflicts:
	doc/Makefile
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 14:48:51 +01:00
Stefano Sabatini
481fdeeecf lavu/opt: add AV_OPT_SAMPLE_FMT option 2012-11-03 12:14:26 +01:00
Stefano Sabatini
c9eaa98a3e doc/ffmpeg: remove -debug option description 
The option belongs to libavcodec, so it results duplicated in the file.
 2012-11-03 11:01:48 +01:00
Janne Grunau
b3fab1f2cd doc: add apidoc target for doxygen API documentation 
Documentation includes only the externally visible API of the installed
headers.

Based on a patch by Anton Khirnov <anton@khirnov.net>.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-11-02 18:28:56 +01:00
Martin Storsjö
c19e9d00a7 doc: Point to the new location of the c99-to-c89 tool 
This location contains prebuilt binaries as well.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-11-01 22:47:50 +02:00
Stefano Sabatini
7669144ada doc/platform: Comply With All Capitalized Words Convention 2012-11-01 19:37:41 +01:00
Stefano Sabatini
14f1fa56b2 doc/filters: add "Notes on filtergraph escaping" section 
Should help to clarify escaping issues in the filtergraph syntax. In
particular, should address trac ticket #1813.
 2012-11-01 11:47:35 +01:00
Carl Eugen Hoyos
7139f0e6be Fix typo in platform documentation. 2012-11-01 01:45:53 +01:00
Clément Bœsch
f53112b665 lavfi: remove hqdn3d libmpcodecs wrapper. 
The native filter was ported from the MPlayer project when the mp
wrapper didn't even exist, and when mp=hqdn3d was added, it was already
obsolete.
 2012-10-31 19:28:02 +01:00
Stefano Sabatini
29a9e4d5c9 lavfi/mp: drop the mp=rectangle filter 
All the rectangle features have been ported to the native drawbox filter,
which has an equivalent syntax.
 2012-10-31 14:46:18 +01:00
Stefano Sabatini
9d478f38cd lavfi/drawbox: add "width" and "height" aliases for "w" and "h" options 2012-10-31 14:43:47 +01:00