virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
60,984 Commits 37 Branches 400 Tags 460 MiB
fb3c33f3cd
Commit Graph

60984 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Timothy Gu
baa650cc79 configure: use pkg-config to detect libbluray 
The current configure fails when static libbluray is compiled with libxml2
support.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 18:57:43 +01:00
Michael Niedermayer
bdadf05ec8 avcodec/parser: put lost comments back 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 18:57:43 +01:00
Paul B Mahol
9d297641ee avformat/sdr2: h264 stream needs parsing 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-02-26 17:46:45 +00:00
Paul B Mahol
9f2a3bcee7 avfilter: remove superflous lines 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-02-26 16:37:59 +00:00
Paul B Mahol
a2e4b4e968 avfilter/af_compand: some more cosmetics to decrease difference with qatar 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-02-26 15:03:09 +00:00
Michael Niedermayer
8f946ac8ea avfilter: remove af_compand_fork 
All relevant changes except the float/double one have been merged

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:21:29 +01:00
Michael Niedermayer
c62d83a5e7 avfilter/af_compand: more cosmetics from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:12:38 +01:00
Michael Niedermayer
05412f4cd4 avfilter/af_compand: cosmetics from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:00:09 +01:00
Michael Niedermayer
5e02ff3e3d avfilter/af_compand: switch defaults to libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:00:09 +01:00
Michael Niedermayer
619d6b8f55 avfilter/af_compand: "use local variable for channels" from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:00:09 +01:00
Michael Niedermayer
e509df4bc8 avfilter/af_compand: error checks from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:00:09 +01:00
Michael Niedermayer
4b87975147 avfilter/af_compand: pts init code from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:46:04 +01:00
Michael Niedermayer
5c78fe08b0 avfilter/af_compand: cosmetics and doxy comment from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:42:47 +01:00
Michael Niedermayer
66ad3292eb avfilter/af_compand: add Andrew Kelley to the copyright 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:40:33 +01:00
Michael Niedermayer
86a191e25b avfilter/af_compand: merge avframe code from af_compand_fork 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:33:28 +01:00
Michael Niedermayer
27ba05adbc avfilter/af_compand: merge uninit() calls on error from af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:11:33 +01:00
Michael Niedermayer
8b80485960 avfilter/af_compand: also support '|' as seperator 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:04:00 +01:00
Michael Niedermayer
1df1a1fe61 avfilter/af_compand_fork: avoid strtok_r() so as not to break build 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 11:48:34 +01:00
Michael Niedermayer
22307f170f avfilter/af_compand: whitespace changes from af_compand_fork 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 11:41:36 +01:00
Michael Niedermayer
5d166de258 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: add compand audio filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/af_compand.c
	libavfilter/allfilters.c
	libavfilter/version.h

The filter is added as new one so as to ease clean merging of its changes
in debug-able steps
See: 6b68e2a43b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 11:27:02 +01:00
Andrew Kelley
738f83582a lavfi: add compand audio filter 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-02-26 08:09:58 +01:00
Carl Eugen Hoyos
96fc2908f0 Read bits_per_coded_sample from V_MS/VFW/FOURCC mkv files. 
Fixes ticket #3425.
 2014-02-26 00:02:51 +01:00
Michael Niedermayer
2673357048 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  parser: cosmetics: Drop some unnecessary parentheses

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 20:52:45 +01:00
Michael Niedermayer
1f2bacc897 Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a' 
* commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a':
  libavfilter: example audio filtering program

Conflicts:
	.gitignore
	configure
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 20:26:00 +01:00
Andrew Kelley
9e329185d7 avfilter/af_compand: fix invalid read 
Fixes #3383.
 2014-02-25 19:00:14 +00:00
Michael Niedermayer
72d580f819 Merge commit 'a1c699659d56b76c0bf399307f642c6fd6d28281' 
* commit 'a1c699659d56b76c0bf399307f642c6fd6d28281':
  parser: K&R formatting cosmetics

Conflicts:
	libavcodec/parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 19:12:30 +01:00
Michael Niedermayer
0306436416 Merge commit 'ed61f3ca8a0664a697782253b354055136c5d303' 
* commit 'ed61f3ca8a0664a697782253b354055136c5d303':
  parser: Remove commented-out cruft

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 19:03:45 +01:00
Hendrik Leppkes
bc249bd673 mpegvideo: re-indent buffer clearing code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 13:47:16 +01:00
Hendrik Leppkes
fa84231ee8 mpegvideo: fix overwriting hwaccel surface objects 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 13:47:10 +01:00
Diego Biurrun
4ec336484d parser: cosmetics: Drop some unnecessary parentheses 2014-02-25 13:40:47 +01:00
Anton Khirnov
e7dfaf16a4 libavfilter: example audio filtering program 
Based on a patch by Andrew Kelley <superjoe30@gmail.com>

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-02-25 13:22:10 +01:00
Peter Ross
bef6b27f10 avcodec/vp8dsp: use AV_ZERO64 to clear idct coefficient rows 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 12:49:35 +01:00
Luca Barbato
a1c699659d parser: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-02-25 12:28:33 +01:00
Diego Biurrun
ed61f3ca8a parser: Remove commented-out cruft 2014-02-25 11:59:05 +01:00
Michael Niedermayer
a8ad7e47fb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  texi2pod: always declare the pod file as UTF-8 encoded

Conflicts:
	doc/texi2pod.pl

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 09:02:57 +01:00
Lukasz Marek
3144440004 lavu/buffer: add release function 
new function allows to unref buffer and obtain its data.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 01:38:52 +01:00
Timothy Gu
774239be71 ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code check 
avio_open2() only return < 0 when error.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 00:05:37 +01:00
Janne Grunau
5ea14d48a8 texi2pod: always declare the pod file as UTF-8 encoded 2014-02-24 23:36:09 +01:00
Michael Niedermayer
75f6ed8dc2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: fix one accented word

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 22:29:24 +01:00
Michael Niedermayer
26dad980ba Merge commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9' 
* commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9':
  doc: name correct header

Conflicts:
	doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 22:19:41 +01:00
Michael Niedermayer
6b06f9f1bc Merge commit '39c2880eeae6930b1036ce1f479afc1e1152c13f' 
* commit '39c2880eeae6930b1036ce1f479afc1e1152c13f':
  af_volume: preserve frame properties

Conflicts:
	libavfilter/af_volume.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 22:13:42 +01:00
Michael Niedermayer
fc10ed2cac Merge commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d' 
* commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d':
  af_resample: preserve frame properties

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 21:46:00 +01:00
Michael Niedermayer
70a25587d2 Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9' 
* commit '67f2a688143b644f99360565a9f36c61a5f052e9':
  avconv: remove a write-only variable

Conflicts:
	ffmpeg.c
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 21:08:19 +01:00
Michael Niedermayer
e66247e926 Merge commit '8aca00cc2b25810bdd85b75f5632844a5614b707' 
* commit '8aca00cc2b25810bdd85b75f5632844a5614b707':
  libx265: Properly handled dynamic linking with MSVC

See: 87769d6c8f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 21:06:45 +01:00
Michael Niedermayer
e1991c7d5f Merge commit '0f7fa48cf1a36ed135c9e0cb01a6b84179aea25b' 
* commit '0f7fa48cf1a36ed135c9e0cb01a6b84179aea25b':
  libx265: Support SAR

See: 73ee4cf307
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 21:03:47 +01:00
Michael Niedermayer
3d53bbd0ac Merge commit '2142b2efcd631db05e4c7c26785e337ecf1258ff' 
* commit '2142b2efcd631db05e4c7c26785e337ecf1258ff':
  libx265: Support 4:4:4

See: d102925a6d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 21:02:36 +01:00
Michael Niedermayer
a88cbdfb90 Merge commit 'd00a504b244e136a0c82a55e21ed94659e0674ad' 
* commit 'd00a504b244e136a0c82a55e21ed94659e0674ad':
  libx265: Update API usage

Conflicts:
	libavcodec/libx265.c

See: d373647194
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 20:53:10 +01:00
Michael Niedermayer
a908de7f49 avformat/options_table: add named constants for avoid_negative_ts 
Idea-by: ubitux
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 19:46:11 +01:00
Vittorio Giovara
c91488ab33 doc: fix one accented word 2014-02-24 17:54:03 +01:00
Vittorio Giovara
48d1ed9c83 doc: name correct header 2014-02-24 17:54:03 +01:00