virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
72,734 Commits 37 Branches 400 Tags 458 MiB
3b89a67315
Commit Graph

72734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Caligula useraccount
3b89a67315 ffserver: Use singlejpeg muxer for jpeg 
Fixes Ticket4218

Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 03:36:22 +02:00
Caligula useraccount
51ac1f616f avformat: Add single jpeg muxer 
Needed to fix Ticket4218

Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 03:36:22 +02:00
Michael Niedermayer
990605768c avcodec/aacdec: Do not return a uninitialized value 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 02:33:39 +02:00
Michael Niedermayer
153d23ee39 Merge commit 'bc76c46943272515805d7ac48ca39f14826d1fed' 
* commit 'bc76c46943272515805d7ac48ca39f14826d1fed':
  aac: Wait to know the channels before allocating frame

Conflicts:
	libavcodec/aacdec.c

See: 676a395ab9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 02:28:44 +02:00
Michael Niedermayer
476692abdb Merge commit 'a188108ebf28ebac9d2b8fc7d5b391aef45698b3' 
* commit 'a188108ebf28ebac9d2b8fc7d5b391aef45698b3':
  aac: Support channel configurations 11 and 12

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 01:31:15 +02:00
Michael Niedermayer
8eb2c411c1 Merge commit '677c804aa3a78d61b21e6423165a252846c20f0e' 
* commit '677c804aa3a78d61b21e6423165a252846c20f0e':
  aac: correctly map 7.1ch-wide AAC from FDK AAC encoder

Sample: FDK_7.1ch_wide.aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 01:29:36 +02:00
Michael Niedermayer
ce838ad950 Merge commit '252d6200c36e7eaa79f8d5205b7d731179e94897' 
* commit '252d6200c36e7eaa79f8d5205b7d731179e94897':
  avio: Add avio_put_str16be

Conflicts:
	doc/APIchanges
	libavformat/avio.h
	libavformat/aviobuf.c
	libavformat/version.h

The FFmpeg implementation is kept as requested by ubitux
Doxy improvements merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 01:17:26 +02:00
Michael Niedermayer
8985e7c561 Merge commit '9b56ac74b170d12027fbc81f581a451a709f1105' 
* commit '9b56ac74b170d12027fbc81f581a451a709f1105':
  mpjpeg: Initial implementation

Conflicts:
	Changelog
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 00:44:28 +02:00
Michael Niedermayer
7856afef52 avformat/hdsenc: Change duration from single to to double precision 
This slightly improves precision

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 00:35:43 +02:00
Michael Niedermayer
0dbea4642f avformat/rmenc: Remove float usage 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-07 21:55:46 +02:00
Michael Niedermayer
4c4c3d5d5a avcodec/libstagefright: Check for pthread_create() failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-07 21:20:21 +02:00
Clément Bœsch
40cc3be73c avfilter: fix a few 5 spaces indent 2015-06-07 20:18:15 +02:00
Michael Niedermayer
7c453277a3 avdevice/iec61883: Check pthread init for failures 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-07 18:57:55 +02:00
Michael Niedermayer
ddda9cee1c ffserver: Check for ffio_set_buf_size() failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-07 15:10:24 +02:00
Michael Niedermayer
0023ea4e20 avformat/aviobuf: Check for ffio_set_buf_size() failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-07 14:57:36 +02:00
Michael Niedermayer
dc55477a64 avformat/ffmdec: Check ffio_set_buf_size() return value 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-07 14:55:10 +02:00
Michael Niedermayer
d6039063aa ffserver: Check allocations (likely not all) 
Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-07 12:42:48 +02:00
Luca Barbato
bc76c46943 aac: Wait to know the channels before allocating frame 
The channel configuration can be delivered only by the PCE,
try to parse it first and not try to decode until a channel
configuration is set.

CC: libav-stable@libav.org
 2015-06-07 10:14:46 +02:00
Sebastian Dröge
a188108ebf aac: Support channel configurations 11 and 12 
These are defined in ISO/IEC 14496-3:2009/PDAM 4 for 6.1 and 7.1.
It also defines another 7.1 layout with configuration 14, that one
is not added here for now.

11: 3/3.1    FC FL+FR BL+BR BC LFE
12: 3/2/2.1  FC FL+FR SiL+SiR BL+BR LFE

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-06-07 10:14:46 +02:00
nu774
677c804aa3 aac: correctly map 7.1ch-wide AAC from FDK AAC encoder 
FDK AAC encoder outputs SCE(front)+CPE(front)+CPE(back)+CPE(back) on
MODE_7_1_REAR_SURROUND configuration.
Since decoder couldn't properly map 4 back channels, decoding failed
unless -request_channel_layout 0x8000000000000000 has been specified.
Now we treat first CPE(back) as CPE(side) on channel mapping.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-06-07 10:14:45 +02:00
Luca Barbato
252d6200c3 avio: Add avio_put_str16be 2015-06-07 10:14:45 +02:00
Luca Barbato
9b56ac74b1 mpjpeg: Initial implementation 
Support only streams with Content-Length.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-06-07 10:14:45 +02:00
James Almer
e225f5f232 fate: add missing avdevice dependency to closed caption test 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-06-07 01:24:50 -03:00
Philip Langdale
cc904353fa avcodec/allcodecs: Re-order nvenc encoders below x264/5. 
We shouldn't pick nvenc by default.

Signed-off-by: Philip Langdale <philipl@overt.org>
 2015-06-06 20:29:17 -07:00
Ganesh Ajjanagadde
42db4aaaa6 vf_colormatrix: calculate coefficients only once 
calc_coefficients is no longer being called every frame

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-07 00:56:32 +02:00
Michael Niedermayer
46428ea332 avcodec/mpegvideo: Use av_memdup() for allocating thread_context 
Also check for allocation failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-06 22:47:50 +02:00
Michael Niedermayer
7ddedd2362 avcodec/mpegvideo: Clear thread_context array before allocating 
This is probably redundant but its safer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-06 22:47:50 +02:00
Michael Niedermayer
f30a7d9861 avcodec/mpegvideo: Merge thread context initialization loops 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-06 22:47:50 +02:00
Philip Langdale
7e4661174a avcodec/nvenc: Add 'nvenc_h264' as an alternative name for 'nvenc' 
This allows us to offer the same codec name that libav uses. We don't have
a special way to do aliases, so it's all a bit more verbose than you'd want
but such is life.

Signed-off-by: Philip Langdale <philipl@overt.org>
 2015-06-06 13:14:14 -07:00
Philip Langdale
e79c40fe72 avcodec/nvenc: Rename nvenc_h265 to nvenc_hevc 
For the sake of compatibility, and because pretty much everything else in the
codebase calls it HEVC.

Signed-off-by: Philip Langdale <philipl@overt.org>
 2015-06-06 13:14:11 -07:00
Philip Langdale
c10e6bcb43 Revert "avcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the other implementation" 
This reverts commit d0d0913702.

Signed-off-by: Philip Langdale <philipl@overt.org>
 2015-06-06 13:14:07 -07:00
Philip Langdale
d47de79372 Revert "Merge commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e'" 
This reverts commit d8bbb99c51, reversing
changes made to d0d0913702.

Signed-off-by: Philip Langdale <philipl@overt.org>
 2015-06-06 13:14:02 -07:00
Philip Langdale
58b49f78cf Revert "nvenc: remove cuda.h requirement for nvenc_a" 
This reverts commit f10497042f.

Signed-off-by: Philip Langdale <philipl@overt.org>
 2015-06-06 13:13:59 -07:00
Philip Langdale
728c82a532 Revert "avcodec/Makefile: fix checkheaders for nvenc_b" 
This reverts commit 3be811a528.

Signed-off-by: Philip Langdale <philipl@overt.org>
 2015-06-06 13:13:56 -07:00
Philip Langdale
8a6536cbc0 Revert "Changelog: Drop duplicate NVENC entry" 
This reverts commit 440fa7758b.

Signed-off-by: Philip Langdale <philipl@overt.org>
 2015-06-06 13:13:49 -07:00
Michael Niedermayer
7944b0ce94 avutil/colorspace: Remove RGB_TO_Y/U/V 
They are unused and colorspace.h is not a installed header

Found-by: Timo Rothenpieler <timo@rothenpieler.org>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-06 18:21:01 +02:00
Paul B Mahol
a03b69478b avcodec/exr: fix crash caused by merge 
Various header informations need to be reset when decoding next frame.
Regression since: 95582b5c

Fixes ticket #4597.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-06 16:02:19 +00:00
James Almer
1b4dd59e5f configure: improve the checks for gmtime_r and localtime_r 
They are inlined wrapper functions inside the time.h header on MinGW-w64, so
neither check_func() or check_func_headers() work with them.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-06-06 12:07:53 -03:00
Michael Niedermayer
440fa7758b Changelog: Drop duplicate NVENC entry 
Found-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-06 14:21:04 +02:00
Clément Bœsch
272f87fc5c avdevice/x11grab: use av_clip() instead of nested min & max 
Note: [xy]_off and screen_[wh] variables are int, as well as
X11GrabContext.{width,height,x_off,y_off}.
 2015-06-06 13:18:29 +02:00
Clément Bœsch
533c37db8d avcodec/snowenc: use av_clip() instead of nested min & max 
Note: AVCodecContext.refs is an int field.
 2015-06-06 13:18:28 +02:00
Clément Bœsch
622ef80e3f avcodec/mpegvideo: use av_clip() instead of nested min & max 
Note: MpegEncContext.mb_{y,height} are int fields, as well as local off
variable.
 2015-06-06 13:18:28 +02:00
Clément Bœsch
0f6118c581 ffplay: use av_clip() instead of nested min & max 
Note: {wanted,min,max}_samples are int variables.
 2015-06-06 13:18:28 +02:00
Ronald S. Bultje
ade5684cda hevc: fix typo (mpv -> mvp). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-06 12:57:20 +02:00
Michael Niedermayer
7897ed0d3c Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavf/http: Add simple autodetection for client HTTP method, based on AVIO_FLAG_READ.
  lavf/http: Indent else-clause.
  lavf/http: Properly process HTTP header on listen.
  lavf/http: Rudimentary error handling for HTTP requests received from clients.
  lavf/http: Process HTTP header before sending response.
  lavf/http: Document method option.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-06 12:34:05 +02:00
Clément Bœsch
c5a08956a3 swresample: fix initilaize/initialize typo 2015-06-06 12:16:18 +02:00
Clément Bœsch
be1862ffb0 doc/filters: fix inaccuarte/inaccurate typo 2015-06-06 12:14:42 +02:00
Stephan Holljes
44d1921200 lavf/http: Add simple autodetection for client HTTP method, based on AVIO_FLAG_READ. 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-06-06 09:24:50 +02:00
Stephan Holljes
290b237556 lavf/http: Indent else-clause. 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-06-06 09:24:50 +02:00
Stephan Holljes
a7e7c68b0e lavf/http: Properly process HTTP header on listen. 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-06-06 09:24:50 +02:00