ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-22 14:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,124 Commits 36 Branches 398 Tags 535 MiB
a8fb8f6112
Commit Graph

71124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
a8fb8f6112 avfilter/vf_qp: split expression parsing out of loop 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 15:17:36 +01:00
Marton Balint
625bd463cd af_channelmap: fix number of channels 
Fixes segfaults with the following command:

ffmpeg -f lavfi -i aevalsrc=0:c=stereo:n=1920 -af 'channelmap=0' test.ac3

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 11:16:26 +01:00
Michael Niedermayer
048b6331e0 avcodec/qsv_internal: Fix project name 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 03:44:19 +01:00
Lukasz Marek
56b7aa2138 doc/examples: add directory listing example 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 03:13:44 +01:00
Tucker DiNapoli
303c3dada2 postproc: Removed unecessary if/else branch when getting QP. 
There's still an if, as QP needs to be modified if isColor=0, but it
still removes a unecessary branch.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 01:49:12 +01:00
Michael Niedermayer
0a731e4596 Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2' 
* commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2':
  lavc: add Intel libmfx-based H.264 encoder

Conflicts:
	Changelog
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 01:33:27 +01:00
Michael Niedermayer
d985976e54 Merge commit '9ba27c2348d26000257e891e40a72facb0d916be' 
* commit '9ba27c2348d26000257e891e40a72facb0d916be':
  qsvdec: add 'decode' to the non-static function names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 01:25:20 +01:00
Michael Niedermayer
b12eacb383 Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791' 
* commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791':
  qsvdec: split off some code that will be shared with the encoder

Conflicts:
	libavcodec/Makefile
	libavcodec/qsvdec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 01:16:21 +01:00
Michael Niedermayer
151ae8ea5b Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1' 
* commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1':
  qsv: rename to qsvdec

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 01:03:23 +01:00
Michael Niedermayer
4ae7c37099 fate: Use a variable QP input for fate-filter-pp 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 00:43:31 +01:00
Michael Niedermayer
c664989803 fate: simplify filter-pp tests 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 00:26:12 +01:00
Anton Khirnov
72b7441a10 lavc: add Intel libmfx-based H.264 encoder 2015-03-27 22:02:10 +01:00
Anton Khirnov
9ba27c2348 qsvdec: add 'decode' to the non-static function names 2015-03-27 21:57:47 +01:00
Anton Khirnov
d0a63d8b98 qsvdec: split off some code that will be shared with the encoder 2015-03-27 21:57:28 +01:00
Anton Khirnov
b04d009b0e qsv: rename to qsvdec 
This is to avoid conflicts with the upcoming QSV encoding support.
 2015-03-27 21:56:36 +01:00
Michael Niedermayer
d03b998c48 avformat/avio: Document the end of list case in avio_read_dir() 
This was mentioned in a previous review

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 21:34:23 +01:00
Himangi Saraogi
fff7871772 lavfi: add inverse telecine filter 
Approved-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 21:34:03 +01:00
Lukasz Marek
184084c699 lavf: add directory listing API 
API allows protocol implementations to provide API that
allows to list directory content.
API is similar to POSIX opendir/readdir/closedir.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 18:29:46 +01:00
Himangi Saraogi
dbce8cdacf avfilter/vf_telecine: Avoid floating point values 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 15:52:59 +01:00
Michael Niedermayer
174330b18e avutil/timer: give each printed value of STOP_TIMER a fixed length 
this makes the result easier to read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 04:44:58 +01:00
Michael Niedermayer
0fee509cf5 avutil/timer: show histogram of cpu cycles each run took 
The new information is printed at verbose log level and can thus be switched on and off
through the log level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 04:20:13 +01:00
James Almer
1f5d1eed78 avutil/cpu: add missing check for mmxext to av_force_cpu_flags 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-03-26 22:54:15 -03:00
Himangi Saraogi
613483dcfb avfilter/vf_telecine: Fix loss of AVFrame properties in output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 02:12:10 +01:00
Michael Niedermayer
0245abc7c1 avcodec/x86/hpeldsp_init: Put CONFIG_* first in if() 
This is more consistent and may fix a build failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-26 15:41:27 +01:00
Michael Niedermayer
cd5a48e549 avcodec/h264_slice: Put CONFIG_GRAY first in if() 
This is more consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-26 15:41:27 +01:00
Michael Niedermayer
47aee6f047 avcodec/arm/flacdsp_init_arm: Put CONFIG_FLAC_DECODER first in if() 
This is more consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-26 15:41:27 +01:00
Michael Niedermayer
71258e5d87 avcodec/ac3dec: Put CONFIG* first in if() 
This may fix build failures with EAC3 disabled and is more consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-26 15:41:27 +01:00
Michael Niedermayer
2139e58439 avformat/dv: fix used dimension variables 
Fixes null pointer dereference during seeking
Fixes Ticket4395

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-26 03:10:27 +01:00
Michael Niedermayer
df43d03731 avformat/rmdec: fix support for 0 sized mdpr 
Fixes Ticket4393

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-26 02:02:18 +01:00
Himangi Saraogi
1301aa55f6 avfilter/vf_telecine: Fix AV desync by using the first input timestamp 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-26 00:41:54 +01:00
Philip Langdale
21adb9964e avcodec/nvenc: Need a separate class for each encoder 
The encoders can't share a class instance.

Signed-off-by: Philip Langdale <philipl@overt.org>
 2015-03-25 15:32:09 -07:00
Stephen Hutchinson
9f91c5198f doc: remove the reference to supporting AviSynth 2.5 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-25 20:38:32 +01:00
Stephen Hutchinson
1492118c9d avisynth: drop support of AviSynth 2.5 
If the user attempts to use AviSynth 2.5, an error message will
now tell them they need to upgrade.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-25 20:37:26 +01:00
Michael Niedermayer
bdcd36a4c8 swscale/output: Fix undefined shifts 
Fixes: da14e86d8462be6493eab16bc2d40f88/asan_heap-oob_204cfd2_528_cov_340150052_COMPRESS.BMP

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-25 18:31:25 +01:00
Stephen Hutchinson
3a6df0b4bb avisynth: ifdef to avoid implicit function declaration errors 
The demuxer doesn't use these functions, so it shouldn't affect
anything.  Investigate whether this can be fixed by how headers
are checked in configure.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-25 16:19:14 +01:00
Himangi Saraogi
b020a25df2 avcodec/j2kenc: Initialize variable to silence compiler warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-25 15:06:36 +01:00
Ronald S. Bultje
589a6042ea avutil: make AVFrameSideData buffers ref-counted. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-25 12:04:00 +01:00
Ronald S. Bultje
b8e36690e8 lavu/frame: move av_frame_copy_props() up in the file. 
Preparation for following patch.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-25 12:03:53 +01:00
James Almer
23e1303c0a avcodec/nvenc_h265: add missing version bump and changelog entry 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-03-25 03:59:34 -03:00
James Almer
7c4910758a configure: add missing dependency for nvenc_h265 
Should fix compilation of builds without nvenc

Signed-off-by: James Almer <jamrial@gmail.com>
 2015-03-25 03:51:10 -03:00
Philip Langdale
21175d8586 avcodec/nvenc: Add support for H.265 encoding 
Sufficiently new nvenc hardware (GM20x or later) has support for H.265
encoding. This works the same as the H.264 encoder except the
codec parameters are different.

Due to the fact that common codec parameters are not shareable, there's
quite a bit of conditional logic you'd wish we could do without, but
such is life.

Signed-off-by: Philip Langdale <philipl@overt.org>
Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
 2015-03-24 21:42:07 -07:00
Michael Niedermayer
354db19ff4 avcodec/h264: Remove bits_per_raw_sample hacks 
Fixes assertion failure

Fixes: f12c79769501ee471a5c731b8304ffcb/signal_sigabrt_7ffff6ac8cc9_3766_cov_4267830138_undemuxable_h264.ts

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-25 04:14:38 +01:00
Stephen Hutchinson
e003a53452 avisynth: update headers against AviSynth+ 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-25 00:22:15 +01:00
Giorgio Vazzana
62e2fae8e4 ffmpeg: fix option name in documentation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-24 23:41:01 +01:00
Michael Niedermayer
19321a295a avformat/utils: Terminate SPS in avci100_1080i_extradata to avoid warnings during parsing 
Fixes: AVCI100_Test.mxf
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-24 18:20:40 +01:00
Michael Niedermayer
e5de6de8f0 avutil/pixfmt: Add missing AV_ prefix to PIX_FMT_YUV411P 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-24 17:36:39 +01:00
Timo Rothenpieler
48f7c30bf7 avcodec/nvenc: Drop support for old nvenc api 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-24 17:25:11 +01:00
Michael Niedermayer
c20eab5c85 avcodec/msrledec: More verbose error message 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-24 16:07:57 +01:00
Michael Niedermayer
f7e1367f58 avcodec/msrledec: restructure msrle_decode_pal4() based on the line number instead of the pixel pointer 
Fixes out of array access
Fixes: da14e86d8462be6493eab16bc2d40f88/asan_heap-oob_204cfd2_528_cov_340150052_COMPRESS.BMP

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-24 16:07:26 +01:00
Jochen Strunk
0276b95242 avformat/mov: check color parameter type explicitly. 
Fixes ticket #4387.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Note, Vittorio Giovara had submitted a very similar fix to me privately
a few hours before this, iam applying Jochens because it comes with a
commit message too and i had not yet applied Vittorios, but For sake
of credit, Vittorio independently solved this first
 2015-03-24 14:06:03 +01:00