ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-24 07:17:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,859 Commits 36 Branches 398 Tags 546 MiB
bd8d73ea8b
Commit Graph

60859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Niedermayer
f284e2a58a swresample: factorize clear_context() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-22 21:36:30 +01:00
Michael Niedermayer
246eae98cf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavr: return an error if a avresample_open() is called on an open context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-22 21:12:02 +01:00
Michael Niedermayer
5367c0be62 Merge commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731' 
* commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731':
  lavr: add a function for checking whether AVAudioResampleContext is open

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-22 21:06:02 +01:00
Anton Khirnov
1db03a6864 lavr: return an error if a avresample_open() is called on an open context 2014-02-22 20:53:09 +01:00
Anton Khirnov
7e86c27b4e lavr: add a function for checking whether AVAudioResampleContext is open 2014-02-22 20:52:36 +01:00
Peter Ross
55479f42ce avformat/nut: add bayer colorspaces 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-22 20:51:13 +01:00
Peter Ross
6236debe1a avcodec/raw: add bayer formats 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-22 18:29:17 +01:00
James Almer
0bc3de19ff x86: add detection for Bit Manipulation Instruction sets 
Based on x264 code

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-22 17:26:00 +01:00
James Almer
a2af8eddab x86: add detection for FMA3 instruction set 
Based on x264 code

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-22 17:25:52 +01:00
Michael Niedermayer
f98821dddb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: Fix a typo from the previous commit

See: 76dd01ecd4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-22 15:58:57 +01:00
Michael Niedermayer
3c096751ff avformat/utils: compute_pkt_fields: Fix DTS for the case where has_b_frames is too large but the correct one is constant 
Fixes issue1.m2ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-22 14:31:23 +01:00
Michael Niedermayer
d4dfa97ae3 avformat/utils: reset pts_buffer in estimate_timings_from_pts() 
This fixes the first few dts after find_stream_info

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-22 14:31:23 +01:00
Michael Niedermayer
f288e1b67c avformat/utils: factorize h264/hevc checks out in compute_pkt_fields() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-22 14:31:23 +01:00
Paul B Mahol
8bcacd9f42 SDR2 demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-02-22 11:40:27 +00:00
Luca Barbato
d922c5a5fb h264: Fix a typo from the previous commit 
f777504f64 changed a - in +

CC: libav-stable@libav.org
 2014-02-22 12:26:32 +01:00
Carl Eugen Hoyos
b89596a432 Fix FSF address in colormatrix and libzvbi license headers. 
As reported by irc user aca.
The files in compat/avisynth are maintained elsewhere, no changes.
 2014-02-22 11:17:56 +01:00
Michael Niedermayer
44b22bba42 avcodec/h264_ps: fix printed num_reorder_frames value 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-22 02:55:55 +01:00
Michael Niedermayer
8c55ff3933 avcodec/h264: use subsample factors of the used pixel format 
Fixes out of array read
Fixes: 1cb91c36c4e55463f14aacb9bdf55b38-asan_heap-oob_106cbce_5617_cov_11212800_h264_mmx_chroma_intra_lf.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-21 23:53:49 +01:00
Michael Niedermayer
9aa59a9ce6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mxf: Add DNxHD UL

See: 2ff540a0fe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-21 21:15:08 +01:00
Michael Niedermayer
f93bd82ee6 Merge commit 'a9099e04026f300924ac363fa6f8aef912677d90' 
* commit 'a9099e04026f300924ac363fa6f8aef912677d90':
  mxf: Add uncompressed 422 8-bit rawvideo UL

Conflicts:
	libavformat/mxf.c

See: 51d632cc8f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-21 21:08:53 +01:00
Reynaldo H. Verdejo Pinochet
b295bce148 qcelp: grammar 
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-02-21 16:57:26 -03:00