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
64,765 Commits 37 Branches 400 Tags 464 MiB
5dcd43cd86
Commit Graph

64765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
14e2406de7 Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3' 
* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3':
  dsputil: Split off FDCT bits into their own context

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/asvenc.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 03:19:06 +02:00
Michael Niedermayer
5c7bf354dc avcodec/crystalhd: Add #if HAVE_UNISTD_H around #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 02:51:56 +02:00
Michael Niedermayer
0ffba9feb6 avutil/cpu: Use HAVE_UNISTD_H instead of HAVE_SYSCONF for #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 02:50:52 +02:00
Michael Niedermayer
576ced5530 avfilter/vf_drawtext: Add #if HAVE_UNISTD_H around #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 02:49:13 +02:00
Michael Niedermayer
0dbcecc8dc avdevice/oss_audio: Add #if HAVE_UNISTD_H around #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 02:48:51 +02:00
Timothy Gu
8e6a66b662 doc: add doxygen target tag 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 02:11:19 +02:00
Timothy Gu
cee98aadb1 doc: make doxygen program configurable 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 02:08:04 +02:00
Timothy Gu
865a761081 doc: add doxy-wrapper.sh to doc/doxygen/html dependencies 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 02:03:35 +02:00
Michael Niedermayer
307239bdb6 ffserver: add HAVE_UNISTD_H around #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 01:56:53 +02:00
Michael Niedermayer
1574eedd0e tools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 01:56:33 +02:00
Michael Niedermayer
39ea21713c avcodec/libxvid: add HAVE_UNISTD_H around #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 01:55:47 +02:00
Michael Niedermayer
0ebcf87803 protect unistd.h with #if HAVE_UNISTD_H in code from recent av_bprint_fd_contents() patches 
Should fix build failure on MSVC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 01:54:30 +02:00
Timothy Gu
5b58692ed4 swresample: misc. doxy improvements 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 01:36:56 +02:00
Michael Niedermayer
9ccc7aeeea doc/Doxyfile: use 5 columns for alphabetical index 
This reverts a hunk from 671005558a
Reduces diff to what we use on the server
Suggested-by: Timothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 00:43:18 +02:00
Michael Niedermayer
242b3c292a Merge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d' 
* commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d':
  libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 23:16:59 +02:00
Michael Niedermayer
75be508f7c Merge commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc' 
* commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc':
  smoothstreamingenc: Fix a memory leak on errors

See: a53c5d454e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 23:05:03 +02:00
Michael Niedermayer
154954c2ac avcodec/vmdvideo: remove unneeded include 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 22:57:36 +02:00
Michael Niedermayer
b8d017adba avformat/segment: simplify localtime* use 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 22:57:36 +02:00
Deti fliegl
8cda23f341 avformat/segment: Support cutting at clocktime 
Signed-off-by: Deti fliegl <fliegl@baycom.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 22:56:55 +02:00
Diego Biurrun
a9aee08d90 dsputil: Split off FDCT bits into their own context 2014-07-07 12:28:45 -07:00
Andrey Utkin
2229a6dfe6 avdevice/lavfi: allow non-mmappable files for graph_file 
Use av_bprint_fd_contents() instead of av_file_map()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 21:28:25 +02:00
Andrey Utkin
fcd1f6bc9d avutil/bprint: Add av_bprint_fd_contents() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 21:28:18 +02:00
Omer Osman
1e9a93bfca libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream 
For implicit signaling cases (as possible for Spectral Band Replication
and Parametric Stereo Tools), the decoder must decode the first frame to
correctly identify the stream configuration (as called from
avformat_find_stream_info). The mechanism for this is built-in and only
requires adding CODEC_CAP_CHANNEL_CONF to the libfdk-aacdec AVCodec
struct.

Signed-off-by: Omer Osman <omer.osman@iis.fraunhofer.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-07 22:09:15 +03:00
Michael Niedermayer
a863c97e99 smoothstreamingenc: Fix a memory leak on errors 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-07 22:08:42 +03:00
Michael Niedermayer
06dae71d47 Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503' 
* commit '246f869590b8c7313d26e1c2ef56db01f6fd2503':
  vmd: Split audio and video decoder

Conflicts:
	libavcodec/vmdvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 18:06:39 +02:00
Nidhi Makhijani
246f869590 vmd: Split audio and video decoder 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-07 07:45:00 -07:00
Michael Niedermayer
5320b34b98 avcodec/cljrdec: remove unneeded include 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 16:31:51 +02:00
Michael Niedermayer
3790801f9c Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b' 
* commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b':
  dsputil: Move draw_edges() to mpegvideoencdsp

Conflicts:
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 16:17:27 +02:00
Michael Niedermayer
020865f557 Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d' 
* commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d':
  dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc

Conflicts:
	libavcodec/dsputil.c
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/dsputilenc.asm
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 15:36:58 +02:00
Michael Niedermayer
462c6cdb8e Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94' 
* commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94':
  dsputil: Split off *_8x8basis to a separate context

Conflicts:
	libavcodec/dsputil.c
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 15:08:55 +02:00
Michael Niedermayer
8324bd5186 avcodec/mpegvideo_enc: fix b frame strategy 2 
Fixes Ticket3757

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 14:59:37 +02:00
Timothy Gu
3be90723e7 transcoding: fix Doxygen file path 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 13:15:32 +02:00
Clément Bœsch
7ac7e8793d avcodec/mpegvideo: small indent fix in vismv code 2014-07-07 11:26:26 +02:00
Clément Bœsch
5f4dbf3c10 avcodec: make vismv option as flag types 
This allows for example -vismv pf+bf+bb instead of -vismv 7.
 2014-07-07 10:24:18 +02:00
Eric Lasota
586406980f avcodec/roqvideodec: set JPEG output color range 
Signed-off-by: Eric Lasota <ejlasota@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 03:06:00 +02:00
Michael Niedermayer
705eb5a177 Merge commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6' 
* commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6':
  audio_fifo: Split into a separate doxygen module

Conflicts:
	libavutil/audio_fifo.h

See: 689e02808d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 00:55:52 +02:00
Michael Niedermayer
52ea7ffdfb Merge commit 'd69243d39b773b64614792487cd93f6ceb237b25' 
* commit 'd69243d39b773b64614792487cd93f6ceb237b25':
  samplefmt: Add doxygen categories

Conflicts:
	libavutil/samplefmt.h

See: b27555a3a0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 00:33:09 +02:00
Michael Niedermayer
28c0319517 Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192' 
* commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192':
  dsicin: Split audio and video decoder

Conflicts:
	libavcodec/Makefile
	libavcodec/dsicinvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 00:04:22 +02:00
Diego Biurrun
3c650efb81 dsputil: Move draw_edges() to mpegvideoencdsp 2014-07-06 14:48:50 -07:00
Michael Niedermayer
96761e9306 Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58' 
* commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58':
  bmv: Split audio and video decoder

Conflicts:
	libavcodec/bmvvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 23:43:37 +02:00
Eric Lasota
8be23d424f avcodec/roqvideo: use JPEG color range 
Signed-off-by: ejlasota <ejlasota@gmail.com>

Also update fate test checksums
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 23:34:58 +02:00
Diego Biurrun
c166148409 dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc 2014-07-06 14:26:53 -07:00
Diego Biurrun
8d686ca59d dsputil: Split off *_8x8basis to a separate context 2014-07-06 13:09:24 -07:00
Timothy Gu
064945b3aa swresample: organize functions into doxy groups 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 22:07:15 +02:00
Timothy Gu
81f47e272d swresample: better doxy for configuration-returning functions 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 22:06:51 +02:00
Timothy Gu
2711b4708a swresample: improve Doxygen introduction 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 21:41:31 +02:00
Timothy Gu
77c5f546e7 swresample: add SwrContext doxy 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 20:58:58 +02:00
Timothy Gu
fc71434e84 swresample: add SwrDitherType doxy 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 20:58:41 +02:00
Timothy Gu
c0d9b026f9 swresample: group all the option constants in a section in doxy 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 20:58:34 +02:00
Timothy Gu
0c58388211 swresample: grammar/capitalization fixes 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 20:46:06 +02:00