x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-07-09 13:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,953 Commits 40 Branches 429 Tags
ef21b3d38e61ba6730eb1d4573da65ca222b3619
Commit Graph
64953 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Eugen Hoyos ef21b3d38e Ignore xing number of frames if the file is larger than indicated. 
Fixes ticket #3777.
 2014-07-24 15:34:36 +02:00
Carl Eugen Hoyos badcd3da81 Print a warning instead of requesting a sample for an invalid exif tag. 
Fixes ticket #3792.
Reviewed-by: Thilo Borgmann
 2014-07-24 11:58:11 +02:00
Lukasz MarekandMichael Niedermayer f753956252 lavfi/src_movie: minor simplifications 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-24 04:50:32 +02:00
Lukasz MarekandMichael Niedermayer 9739255365 lavfi/src_movie: remove frame from priv context 
This variable is used only inside one function.
There is no need to store it in context.

This also may prevent crush by double free frame.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-24 04:48:49 +02:00
Michael Niedermayer 8b59ab1af0 Merge commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785' 
* commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785':
  http: K&R formatting cosmetics

Conflicts:
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-24 02:08:14 +02:00
Michael Niedermayer ab0f78ea77 Merge commit 'd0de7330b973b354e2ceb0b99fd545b868b0a9c4' 
* commit 'd0de7330b973b354e2ceb0b99fd545b868b0a9c4':
  fft-test: Pass correct struct members to (i)dct functions

Conflicts:
	libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-24 01:50:01 +02:00
Michael Niedermayer 02ea384abd Merge commit '6133d65861f265d429ade53e910fe877c95a1615' 
* commit '6133d65861f265d429ade53e910fe877c95a1615':
  fft-test: K&R formatting cosmetics

Conflicts:
	libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-24 01:22:31 +02:00
Michael Niedermayer 629e5e28f7 avcodec/fft-test: fix memory alloc checks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-24 00:47:11 +02:00
Michael Niedermayer 074bb7515e Merge commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9' 
* commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9':
  fft-test: Check memory allocations

Conflicts:
	libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-24 00:35:40 +02:00
Diego Biurrun ce2e858f5b http: K&R formatting cosmetics 
Also comment some #endifs and reshuffle headers into canonical order.
 2014-07-23 13:57:24 -07:00
Christophe GisquetandMichael Niedermayer 670b7f203a x86: hevcdsp: align 
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 22:18:08 +02:00
Diego Biurrun d0de7330b9 fft-test: Pass correct struct members to (i)dct functions 
This fixes a number of incompatible pointer type warnings.
 2014-07-23 13:05:25 -07:00
Diego Biurrun 6133d65861 fft-test: K&R formatting cosmetics 
Also rearrange #includes into canonical order.
 2014-07-23 13:05:19 -07:00
Christophe GisquetandMichael Niedermayer 373677f958 hevc_mvs: avoid deriving tmvp in amvp 
Reduces on a sequence number of calls from 933685 to 586271.

Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 21:21:49 +02:00
Christophe GisquetandMichael Niedermayer ca081217cd hevcdsp: change types of SAO parameters 
From openhevc

Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 20:54:03 +02:00
Michael Niedermayer 088875b6b8 Merge commit '7288b345850792430302a8f85a4b29140b770497' 
* commit '7288b345850792430302a8f85a4b29140b770497':
  fft-test: Drop unnecessary pointer indirection for context structs

Conflicts:
	libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 20:48:05 +02:00
Michael Niedermayer 09f5b3750f Merge commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb' 
* commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb':
  fft-test: Reduce variable scope where sensibly possible

Conflicts:
	libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 20:40:41 +02:00
Michael Niedermayer 97d2b8d6f5 Merge commit 'eac77fcd56fc2a3391f0d86faf54302afb368ff7' 
* commit 'eac77fcd56fc2a3391f0d86faf54302afb368ff7':
  mpegenccontext: Remove unused dct_unquantize_h261 function pointers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 20:20:08 +02:00
Andrey UtkinandMichael Niedermayer b6a6459a24 lavd/lavfi: work with non-mappable files for graph_file option 
Example of non-mappable file is /dev/stdin. Previously passing it as
graph_file value returned error.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 18:42:41 +02:00
Andrey UtkinandMichael Niedermayer 8a4c0866dc avio: Introduce avio_read_to_bprint(avioctx, bp, max_size) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 18:42:41 +02:00
Michael Niedermayer 01b236b704 avformat/flvdec: use AV_PKT_DATA_NEW_EXTRADATA for h264 too 
Fixes Ticket 3787

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 17:41:12 +02:00
Michael Niedermayer 601c238854 avcodec/h264: support AV_PKT_DATA_NEW_EXTRADATA 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 17:40:21 +02:00
Michael Niedermayer 1bf371b24e avcodec/h264: factor is_extra() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 17:40:21 +02:00
Diego Biurrun c3c96deb5f fft-test: Check memory allocations 2014-07-23 06:05:02 -07:00
Diego Biurrun 7288b34585 fft-test: Drop unnecessary pointer indirection for context structs 2014-07-23 06:05:02 -07:00
Diego Biurrun d445c865f8 fft-test: Reduce variable scope where sensibly possible 
Also merge variable declaration and initialization.
 2014-07-23 06:05:02 -07:00
Michael Niedermayer 54256482cb Merge commit '20ec0daaa1cdd3996ac6ed0198de961129474044' 
* commit '20ec0daaa1cdd3996ac6ed0198de961129474044':
  fft-test: Make global exptab variable static

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 14:27:10 +02:00
Michael Niedermayer d0cb6caf69 Merge commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb' 
* commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb':
  mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 14:15:48 +02:00
Nidhi MakhijaniandDiego Biurrun eac77fcd56 mpegenccontext: Remove unused dct_unquantize_h261 function pointers 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-23 05:07:21 -07:00
Diego Biurrun 20ec0daaa1 fft-test: Make global exptab variable static 2014-07-23 03:45:33 -07:00
Diego Biurrun 2b6ab3a2bd mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used 2014-07-23 03:16:55 -07:00
Carl Eugen Hoyos c75fdee747 avcodec/x86/hevc_deblock: Fix compilation with nasm. 2014-07-23 10:32:27 +02:00
Michael Niedermayer bbc5adfb94 avutil/opt: Fix parsing regression with constants starting with numbers 
Fixes parsing "3dnow"

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 08:42:52 +02:00
Michael Niedermayer a61325798a Changelog: add "version <next>:" so people dont add new things to the last release 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 02:38:26 +02:00
Michael Niedermayer 7e5d75d53f Merge commit '06a1d1323bc8afd03f085ae98d9b74e431b3534e' 
* commit '06a1d1323bc8afd03f085ae98d9b74e431b3534e':
  configure: Extend the neon intrinsics check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 00:34:36 +02:00
Michael Niedermayer 9515d7c629 Merge commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc' 
* commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc':
  fft-test: Comment some #endifs

Conflicts:
	libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 00:29:06 +02:00
Michael Niedermayer 9eeedf8769 Merge commit '57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5' 
* commit '57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5':
  fft-test: Drop unnecessary #ifdefs around header includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 00:23:28 +02:00
Michael Niedermayer 77304cf352 avcodec: dct/rdft only support float mode, skip their contents for fixed point 2014-07-23 00:18:24 +02:00
Michael Niedermayer 005e81d6cf Merge commit '11c7155cce50971a38e6cebd39a3ba5a54645fae' 
* commit '11c7155cce50971a38e6cebd39a3ba5a54645fae':
  dct/rdft: Add missing typedefs for context structs

Not merged, as it breaks build

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-22 23:02:11 +02:00
Martin Storsjö 06a1d1323b configure: Extend the neon intrinsics check 
Check for an instruction that causes the (very old) Apple GCC 4.2
to error out ("unrecognizable insn").

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-22 23:57:23 +03:00
Michael Niedermayer 1df2f7b6a8 Merge commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd' 
* commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd':
  build: Add define for SIMD extensions requiring 16-byte aligned buffers

Conflicts:
	configure
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-22 22:32:40 +02:00
Michael Niedermayer 013172ae9f Merge commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3' 
* commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3':
  libxvid: Drop PPC-specific CPU detection hack

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-22 22:23:26 +02:00
Michael Niedermayer 016cca4504 Merge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532' 
* commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532':
  http: Use a constant for the supported header size

Conflicts:
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-22 22:02:48 +02:00
Diego Biurrun 5be7d8597d fft-test: Comment some #endifs 2014-07-22 11:55:40 -07:00
Diego Biurrun 57f1b1dcc7 fft-test: Drop unnecessary #ifdefs around header includes 2014-07-22 11:55:40 -07:00
Diego Biurrun 11c7155cce dct/rdft: Add missing typedefs for context structs 
Without the typedefs there can be trouble depending on #include order.
 2014-07-22 11:55:40 -07:00
Diego Biurrun eba2233b58 build: Add define for SIMD extensions requiring 16-byte aligned buffers 2014-07-22 11:46:35 -07:00
Diego Biurrun 67bc1ba5d7 libxvid: Drop PPC-specific CPU detection hack 
It is doubtful if the hack (still) works and Xvid had ten years to fix it.
 2014-07-22 11:45:07 -07:00
Michael Niedermayer bc15b5238f Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Autodetect big-endian tiff files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-22 18:23:53 +02:00
Christophe GisquetandMichael Niedermayer ed248e7f70 hevc: wait proper position for tmvp 
The position is either rounded or not checked, so delay the wait to
check the proper value.

Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-22 18:11:50 +02:00