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
Stephan Holljes
8cfaa76a5e
lavf/http: Rudimentary error handling for HTTP requests received from clients.
...
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com >
2015-06-06 09:24:43 +02:00
Stephan Holljes
bbcee92b6d
lavf/http: Process HTTP header before sending response.
...
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com >
2015-06-06 09:13:42 +02:00
Stephan Holljes
aa74401af8
lavf/http: Document method option.
...
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com >
2015-06-06 09:13:41 +02:00
Michael Niedermayer
f07376402c
avformat/mxfenc: Add mxf muxer avclass
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-06 02:39:01 +02:00
Michael Niedermayer
802cca5905
avcodec/s302m: Only set the sample rate when some data is output
...
This way ffplay chooses the mp2 stream for Ticket3890
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-06 01:12:06 +02:00
Michael Niedermayer
42c41e96ff
avformat/utils: Do not select audio streams with unknown sample rate in av_find_best_stream()
...
Together with the next commit this prevents non-PCM S302M from being selected unless either
it can be decoded or the user selects passthrough/copy
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-06 01:02:43 +02:00
Michael Niedermayer
51080dfa08
avcodec/s302m: Check for non PCM Streams
...
Allow the user to choose what to do with the non PCM data through AVOptions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-06 00:54:51 +02:00
Ganesh Ajjanagadde
a86928d2ab
flvdec: fix lack of duration for some files
...
Fixes #4579
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-05 21:56:09 +02:00
Michael Niedermayer
108b738db1
avformat/flvdec: Show unknown tags at debug level
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-05 21:56:09 +02:00
Michael Niedermayer
790a3cdf76
avformat/flvdec: Add TYPE_ONCAPTIONINFO
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-05 21:56:09 +02:00
Michael Niedermayer
b2fecce3c1
avformat/flvdec: increase buffer size for parsing metadata string key
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-05 21:55:45 +02:00
Michael Niedermayer
6fd15d6e90
Revert addition of a few fixed_dsp functions to APIChanges
...
The header is not installed currently so the changes should not be in APIChanges
Found-by: Ronald S. Bultje and others
This reverts part of commit 19ed3e35a5
.
2015-06-05 20:21:48 +02:00
Michael Niedermayer
06b49375a2
avutil/ppc/cpu: add include avassert.h
...
fix build failure on ppc64
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-05 19:12:58 +02:00
Michael Niedermayer
af8d63e756
avutil/softfloat: Fix alternative implementation of av_normalize1_sf()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-05 17:40:16 +02:00
Michael Niedermayer
6690ca22b3
avutil/softfloat: Fix alternative implementation of av_normalize_sf()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-05 17:40:16 +02:00
Andreas Cadhalpun
5bf84a584e
arm: only enable setend on ARMv6
...
Without this check it causes SIGILL crashes on ARMv5.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2015-06-05 17:14:10 +02:00
Michael Niedermayer
d3585c53de
avutil/softfloat: Move av_sincos_sf() from header to c file
...
The function is quite big and trigonometric functions should not really
be used in speed critical code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-05 13:42:05 +02:00
Nedeljko Babic
19ed3e35a5
libavutil/doc: Changes in documentation due to changes to fixed_dsp
...
New functions are added to fixed_dsp, so the documentation is changed
accordingly.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-05 13:42:05 +02:00
Michael Niedermayer
904ea60afa
avutil/softfloat: Add more tests for the normalization
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-05 12:57:06 +02:00
Michael Niedermayer
c7ce16e716
avutil/softfloat: Fix thresholds in av_normalize_sf()
...
Found-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-05 12:56:12 +02:00
Michael Niedermayer
c93602ae5b
avcodec/rdft: Use more specific error codes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-05 04:05:57 +02:00
Vignesh Venkatasubramanian
7be0f48a32
lavf/matroskaenc: Write Block Keyframe correctly
...
Per matroska Block Structure [1], for keyframes 0th bit of the flag
should not be set (unlike SimpleBlocks). For Blocks, keyframes is
inferred by the absence of ReferenceBlock element (as done by
matroskadec). This CL writes the flag correctly and inserts the
ReferenceBlock element for non-keyframes. The timestamp inserted is
that of the immediately preceding frame (which is true for VP8 and VP9
- the only 2 codecs using the matroska block element as of now). It
also considers all non-video frames (audio, subtitles, metadata) to
be keyframes.
[1] http://www.matroska.org/technical/specs/index.html#block_structure
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-05 02:48:04 +02:00
Michael Niedermayer
c94d9079b1
avcodec/utils: Assert that audio decoders do not report using more data than was input
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-04 23:10:56 +02:00
Michael Niedermayer
c265763318
avcodec/alsdec: Check for overread
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-04 23:10:56 +02:00
Michael Niedermayer
6b6ae7c3ea
avcodec/atrac3plusdec: consume only as many bytes as available
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-04 23:10:56 +02:00
Michael Niedermayer
3c803ed9cb
avcodec/adpcm: Check for overreads
...
See: vlc ticket 14649
Reported-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-04 22:37:01 +02:00
Shivraj Patil
a34d902325
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC idct functions
...
This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC idct functions in new file hevc_idct_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-04 18:39:53 +02:00
Nedeljko Babic
7131aba916
libavutil/softfloat: Fix av_normalize1_sf bias.
...
av_normalize1_sf doesn't properly address border case when mantis is
exactly -0x40000000.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-04 17:20:03 +02:00
Juanjo
a213e57cef
lavf/riffenc: Set correct block align for mp2.
...
Rounding by Michael.
Fixes ticket #4565 .
2015-06-04 17:03:34 +02:00
Carl Eugen Hoyos
3b4e694ead
lavfi/tinterlace: Double aspect ratio for modes merge and pad.
2015-06-04 17:03:29 +02:00
Michael Niedermayer
b14361486b
swresample/resample: fix typos
...
Found-by: wm4 <nfxjfg@googlemail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-04 13:04:09 +02:00