RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
60,880 Commits 36 Branches 398 Tags 244 MiB
Commit Graph

60880 Commits

Author SHA1 Message Date
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
Derek Buitenhuis 6d18154f61 libx265: Use proper error code 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-24 11:10:23 -05:00
Derek Buitenhuis 87769d6c8f libx265: Properly handled dynamic linking with MSVC 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-24 11:10:23 -05:00
Derek Buitenhuis 73ee4cf307 libx265: Support SAR 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-24 11:10:23 -05:00
Derek Buitenhuis d102925a6d libx265: Support 4:4:4 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-24 11:10:17 -05:00
Derek Buitenhuis d373647194 libx265: Update API usage 
Framerate is now a sane rational instead of an integer, and
inputDepth is changed to what it actually is.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-24 11:09:30 -05:00
Derek Buitenhuis d00a504b24 libx265: Update API usage 
Framerate is now a sane rational instead of an integer, and
inputDepth is changed to what it actually is.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-24 15:50:04 +00:00
Michael Niedermayer 2a3cb1cfca Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Use av_frame_copy() to simplify code where appropriate.

Conflicts:
	libavfilter/vf_copy.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 10:47:47 +01:00
Michael Niedermayer 7a9946d386 Merge commit '8feac29cc46270cc89d6016340e7bac780877131' 
* commit '8feac29cc46270cc89d6016340e7bac780877131':
  lavc: use AVFrame API properly in ff_reget_buffer()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 10:15:19 +01:00
Michael Niedermayer 74bb1ca82c avutil/frame_copy_audio: also check that channels match 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 10:12:33 +01:00
Michael Niedermayer fff5262301 Merge commit '1155fd02ae7bac215acab316e847c6bb25f74fc3' 
* commit '1155fd02ae7bac215acab316e847c6bb25f74fc3':
  frame: add a convenience function for copying AVFrame data

Conflicts:
	doc/APIchanges
	libavutil/frame.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 09:38:32 +01:00
Michael Niedermayer cc6cc84bc4 Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1' 
* commit '746dca483a2f0f2639265f6e1c0085c8861875a1':
  avconv: support forcing codec tags for input streams

Conflicts:
	doc/ffmpeg.texi

See: 6bca574a98
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 09:15:46 +01:00
James Almer 3f3d748cab x86: Move XOP emulation to x86util 
We need the emulation to support the cases where the first
argument is the same as the fourth. To achieve this a fifth
argument working as a temporary may be needed.
Emulation that doesn't obey the original instruction semantics
can't be in x86inc.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 08:30:19 +01:00
Michael Niedermayer 6c6e4dd139 swr: check that the context for swr_convert() has been initialized 
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 08:23:42 +01:00
Michael Niedermayer a66be60888 swresample: add swr_is_initialized() 
Idea-from/based-on: 7e86c27b4e
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 08:23:22 +01:00
Anton Khirnov 30517a9f05 Use av_frame_copy() to simplify code where appropriate. 2014-02-24 07:25:07 +01:00
Anton Khirnov 8feac29cc4 lavc: use AVFrame API properly in ff_reget_buffer() 2014-02-24 07:25:07 +01:00
Anton Khirnov 1155fd02ae frame: add a convenience function for copying AVFrame data 2014-02-24 07:25:07 +01:00
Anton Khirnov 746dca483a avconv: support forcing codec tags for input streams 2014-02-24 07:25:07 +01:00
James Almer 313a6c65b7 oggdec: validate VP8 keyframes 
Fixes seeking with broken files

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 02:24:21 +01:00
Michael Niedermayer bd8d73ea8b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: add detection for Bit Manipulation Instruction sets

Conflicts:
	libavutil/x86/cpu.c

See: 0bc3de19ff
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 22:52:58 +01:00
Michael Niedermayer d9574069c1 Merge commit '1b932eb1508f550fac9e911923a0383efda53aa3' 
* commit '1b932eb1508f550fac9e911923a0383efda53aa3':
  x86: add detection for FMA3 instruction set

Conflicts:
	configure
	libavutil/cpu.h
	libavutil/x86/cpu.c

See: a2af8eddab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 22:43:08 +01:00
Michael Niedermayer 0982433253 Merge commit '10b0161d78148f46eaffb29ea022378947eaef2c' 
* commit '10b0161d78148f46eaffb29ea022378947eaef2c':
  x86: add missing XOP checks and macros

Conflicts:
	configure
	libavutil/x86/cpu.h

See: 6c12b1de06
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 22:35:23 +01:00
Michael Niedermayer 38336f0fb1 Merge commit '5800ba0db667630e6ff81d30f03961ea10726aa6' 
* commit '5800ba0db667630e6ff81d30f03961ea10726aa6':
  configure: disable cpunop if the check fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 22:25:13 +01:00
Diego Biurrun 96ea3dea58 configure: Move cpunop into ARCH_EXT_LIST_X86 
It is a processor feature, so it belongs there.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 22:24:51 +01:00
Michael Niedermayer 1287b640f0 Merge commit '8eeacf31c5ea37baf6b222dc38d20cf4fd33c455' 
* commit '8eeacf31c5ea37baf6b222dc38d20cf4fd33c455':
  hevc: Do not left shift a negative value in hevc_loop_filter_chroma

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 22:18:09 +01:00
Michael Niedermayer a2e4b23bfe Merge commit 'ff486c0f7f6b2ace3f0238660bc06cc35b389676' 
* commit 'ff486c0f7f6b2ace3f0238660bc06cc35b389676':
  hevc: Do not right shift a negative value in get_pcm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 22:11:51 +01:00
Michael Niedermayer c2b5981afa Merge commit '50c988aa6d6c6f0ceb8f922bcea34800b56b85d9' 
* commit '50c988aa6d6c6f0ceb8f922bcea34800b56b85d9':
  hevc: Drop unnecessary shifts in deblocking_filter_CTB

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 22:05:12 +01:00
Clément Bœsch 57ec555e8e avcodec/pngenc: fix invalid read in sub filter. 
First pixel was computed based on invalid address read, and then
corrected by the following memcpy. After the commit, it's not computed
anymore, and memcpy fills the appropriate area.

Fixes Ticket #3387
 2014-02-23 20:40:52 +01:00
Michael Niedermayer 72e6913140 avcodec/h264: clear chroma planes when flags gray is used 
Fixes Ticket3397
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 18:22:13 +01:00
Michael Niedermayer 42361bdf51 avcodec/mpegvideo: fix buffer clear code so it should work with negative linesizes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 18:14:59 +01:00
James Almer d59fcdaff3 x86: add detection for Bit Manipulation Instruction sets 
Based on x264 code

Signed-off-by: James Almer <jamrial@gmail.com>
 2014-02-23 15:29:36 +01:00
James Almer 1b932eb150 x86: add detection for FMA3 instruction set 
Based on x264 code

Signed-off-by: James Almer <jamrial@gmail.com>
 2014-02-23 15:29:36 +01:00
James Almer 10b0161d78 x86: add missing XOP checks and macros 
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-02-23 15:29:36 +01:00
Janne Grunau 5800ba0db6 configure: disable cpunop if the check fails 
Moving cpunop from the HAVE_LIST to the ARCH_EXT_LIST_X86 has the side
effect of enabling it. The semantics of the check have to be changed
from enable if successful to disable if unsuccessful. This was missing
in 2b0bb69997 causing build errors with
nasm.
 2014-02-23 15:29:20 +01:00
Luca Barbato 8eeacf31c5 hevc: Do not left shift a negative value in hevc_loop_filter_chroma 2014-02-23 14:34:41 +01:00
Luca Barbato ff486c0f7f hevc: Do not right shift a negative value in get_pcm 2014-02-23 14:34:40 +01:00
Luca Barbato 50c988aa6d hevc: Drop unnecessary shifts in deblocking_filter_CTB 
beta_offset is pre-multiplied by 2.
 2014-02-23 14:34:34 +01:00
Carl Eugen Hoyos 5642dd41cc Add more Bayer colour spaces to the video4linux2 device wrapper. 2014-02-23 13:42:41 +01:00
Peter Ross dd5abb0bac avdevice/v4l2: add V4L2_PIX_FMT_SRGGB8 2014-02-23 13:42:41 +01:00
Sylvain Fabre 526049ce61 Issue-#3407 : Enhance precision for double to string conversion, useful for GEOTIFF double values 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 13:03:18 +01:00
Peter Ross 02b63246cf libswscale: bayer to rgb24 & yv12 colorspace converters 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 02:38:22 +01:00
Peter Ross 7e23cfba76 avcodec/rawdec: for 16-bit pix fmts, shift pixels when bits_per_coded_sample < 16 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 02:38:17 +01:00
Peter Ross a3a4d07d6a avutil/pixdesc: set bayer pixfmt descriptor flags 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 02:24:03 +01:00
Dave Yeo e5858fef38 configure: Revert commit 5176e9651b 
This fixes cpunop detection and unbreaks NASM assembly

Signed-off-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 01:34:05 +01:00
Carl Eugen Hoyos 5d6fac114b Support old qclp-in-mov files that do not store bytes_per_frame in the header. 
Fixes ticket #2649.
 2014-02-23 00:41:53 +01:00
Carl Eugen Hoyos 0aded6bf02 Support MPEG-2 video mov files with sample description mp2v. 2014-02-23 00:31:50 +01:00
Michael Niedermayer 717ec57c7e avformat/movenc: shift positive timestamps to 0 if edit lists cannot be used 
Fix handling of timestamps which start  far away from 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-22 22:39:50 +01:00
Michael Niedermayer a89c012531 avformat/mux: support shifting timestamps so they start at 0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-22 22:39:49 +01:00