generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
73,880 Commits 24 Branches 241 Tags 173 MiB
593731efa8
Commit Graph

73880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Khirnov
be101bc1e3 avconv: create the complex filtergraphs earlier 
Since global options are processed before all the other options now, we
do not have to try creating the complex filtergraphs several times
anymore, it is enough to do it once after the input files are opened.
 2015-07-19 09:38:44 +02:00
Anton Khirnov
1959351aec avconv: move the no streams failure to open_output_file() 
It is a better place for it, there is no reason to wait until
transcode_init().
 2015-07-19 09:38:28 +02:00
Anton Khirnov
ab7b038906 avconv: factor out the output stream initialization 2015-07-19 09:38:25 +02:00
Anton Khirnov
bd2ab27c48 avconv: use read_file() for reading the 2pass stats 
Also, drop the now unused cmdutils_read_file(). There is no reason to
have two functions doing essentially the same thing.
 2015-07-19 09:37:11 +02:00
Anton Khirnov
6d5d924604 avconv: move handling the 2pass logfile into avconv_opt 
It more logically belongs there.
 2015-07-19 09:34:24 +02:00
Anton Khirnov
59245e0c5e avconv: set the encoding/decoding_needed flags earlier 
This will be useful in the following commits.
 2015-07-19 09:34:08 +02:00
Anton Khirnov
56c2f37727 avconv: drop update_sample_fmt() 
There is only one decoder left that supports this (libopus, which is not
used by default since we have a native one) and this code goes against
the avconv design, since it propagates information back from the encoder
to decoder.
 2015-07-19 09:33:51 +02:00
Alexandra Hájková
e61f39849c asfdec: make nb_sub to be unsigned int 
number of subpayloads should be always positive

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-19 09:20:01 +02:00
Alexandra Hájková
2883ef34b5 asfdec: read the replicated data in a separate function 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-19 09:18:27 +02:00
Alexandra Hájková
0989d3ad1f asfdec: convert condition for the replicated data reading to be safer 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-19 09:16:28 +02:00
Alexandra Hájková
406627287e asfdec: do not read replicated data when their length is 0 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-19 08:59:48 +02:00
Michael Niedermayer
54882156dd avcodec/hevc_parser: Treat extradata parsing differently, as it should not contain an AU 
Fixes ticket4718

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 03:24:25 +02:00
James Almer
bd48764532 avutil/x86/bswap: force inline asm versions with ICC 
Recent ICC versions that define GCC as >= 4.5 (like ICC 13) apparently can't
optimize the generic C versions of av_bswap*() on their own.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-18 20:48:09 -03:00
James Almer
78347549a4 avutil/intmath: check for ICC before GCC 
Intel compiler also defines __GNUC__, so the Intel specific intrinsics were not
really being used.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-18 19:59:34 -03:00
Paul B Mahol
9a829a2b6a avfilter/vf_blend: unbreak tblend 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-18 05:01:16 +00:00
Paul B Mahol
5c7f708683 fate: add tblend filter test 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-18 05:01:16 +00:00
Michael Niedermayer
b5e716ae13 avformat/mpegtsenc: Add sdt_period, similar to pat_period 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 23:26:05 +02:00
Michael Niedermayer
34da54fd1a avformat/mpegtsenc: Support a user specified PAT/PMT period 
Can be used to fix Ticket3714

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 22:24:25 +02:00
Michael Niedermayer
a9c1545a33 avformat/mpegtsenc: support storing PAT/PMT per frame 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 22:19:19 +02:00
Ganesh Ajjanagadde
e3e4f1752c doc/developer: add url for sample files 
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 21:20:34 +02:00
Paul B Mahol
efd4e5fe68 avfilter/vf_blend: implement 16bit support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-18 02:07:44 +00:00
Paul B Mahol
e03cb1e115 fate: add test for mergeplanes filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-18 01:55:44 +00:00
Michael Niedermayer
599d746e07 avcodec/vp8: Check buffer size in vp8_decode_frame_header() 
avoids null pointer dereference
Fixes: signal_sigsegv_d5de40_964_vp80-00-comprehensive-010.ivf with memlimit of 1048576

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 19:37:04 +02:00
Michael Niedermayer
a84f0e8d8f avcodec/vp8: Fix null pointer dereference in ff_vp8_decode_free() 
Fixes: signal_sigsegv_d5de23_967_vp80_00_comprehensive_010.ivf with memlimit 524288

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 19:03:23 +02:00
Michael Niedermayer
1c5b712c0a avcodec/diracdec: Check for hpel_base allocation failure 
Fixes null pointer dereference
Fixes: signal_sigsegv_b02a96_280_RL_420p_ffdirac.drc with memlimit of 67108864

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 18:05:41 +02:00
Michael Niedermayer
a194298954 avformat/movenc: Drop redundant bit exact field from context 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 13:27:33 +02:00
Michael Niedermayer
3197c0aa87 avcodec/rv34: Clear pointers in ff_rv34_decode_init_thread_copy() 
Avoids leaving stale pointers
Fixes: signal_sigabrt_7ffff70eccc9_819_sabtriple.rm with memlimit 536870912

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 11:28:17 +02:00
Michael Niedermayer
129785b5e8 avutil/frame: Update AVFrame docs library references 
These where apparently forgotten when AVFrames where moved into libavutil

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 10:46:36 +02:00
Michael Niedermayer
2927b61c55 avfilter/af_dynaudnorm: Use av_frame_get_channels() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 10:45:29 +02:00
Michael Niedermayer
f8e4d37983 avcodec/hevc_ps: Also print depth in failure path of map_pixel_format() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 05:12:00 +02:00
Ganesh Ajjanagadde
f6870495e1 avformat: increase first_frames threshold for mp3,ac3 
Fixes Ticket4723

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 04:52:49 +02:00
Michael Niedermayer
9010be252e Merge commit 'c9f8cfb6d9b34f3c51f1b7152c4dc3f2f8724dc4' 
* commit 'c9f8cfb6d9b34f3c51f1b7152c4dc3f2f8724dc4':
  fate: add checkasm target

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 02:39:01 +02:00
Michael Niedermayer
e6b01480e5 Merge commit '82e6ac85ff9aa7631b8c01521b3d6b5ca0bc8014' 
* commit '82e6ac85ff9aa7631b8c01521b3d6b5ca0bc8014':
  checkasm: test all architectures with optimisations

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 02:31:14 +02:00
Michael Niedermayer
3ad30d1bc0 Merge commit 'cb33f8d0f48b1e9d642ca1cbea142dcbedd08a27' 
* commit 'cb33f8d0f48b1e9d642ca1cbea142dcbedd08a27':
  checkasm: Give macro a body to avoid potential unexpected syntax issues

See: a39512ba9e
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 02:23:47 +02:00
Michael Niedermayer
78274b19f1 Merge commit '6cc4d3e9a982e926494f4b919d9733fe29774acf' 
* commit '6cc4d3e9a982e926494f4b919d9733fe29774acf':
  checkasm: exit with status 0 instead of 1 if there are no tests to perform

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 02:22:43 +02:00
Michael Niedermayer
c0894e6288 Merge commit '256ef19844892c6cf8e0386e3287bae970ec6320' 
* commit '256ef19844892c6cf8e0386e3287bae970ec6320':
  h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1

Conflicts:
	libavcodec/arm/h264pred_init_arm.c

See: 565cabf5c8
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 02:13:22 +02:00
Michael Niedermayer
b1861f18b6 Merge commit 'fc56868399213d3e9be19bdebeb64df233b39a7e' 
* commit 'fc56868399213d3e9be19bdebeb64df233b39a7e':
  cosmetics: Reformat checkasm tests

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 01:57:04 +02:00
Zhang Rui
f477a3f5ab avformat/async: support filling with a background thread. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 01:46:50 +02:00
Janne Grunau
c9f8cfb6d9 fate: add checkasm target 2015-07-18 01:06:45 +02:00
Janne Grunau
82e6ac85ff checkasm: test all architectures with optimisations 2015-07-18 01:06:45 +02:00
Michael Niedermayer
cb33f8d0f4 checkasm: Give macro a body to avoid potential unexpected syntax issues 2015-07-18 01:06:44 +02:00
Henrik Gramner
6cc4d3e9a9 checkasm: exit with status 0 instead of 1 if there are no tests to perform 2015-07-18 01:06:44 +02:00
Janne Grunau
256ef19844 h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1 2015-07-18 00:28:49 +02:00
Michael Niedermayer
72d1409e23 Merge commit 'd37f23263584774e1798e9ac909a398304a05091' 
* commit 'd37f23263584774e1798e9ac909a398304a05091':
  checkasm: Add unit tests for bswapdsp

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-17 23:26:59 +02:00
Michael Niedermayer
52b6d96268 Merge commit 'a344e5d094ebcf9a23acf3a27c56cbbbc829db42' 
* commit 'a344e5d094ebcf9a23acf3a27c56cbbbc829db42':
  x86: bswapdsp: Don't treat 32-bit integers as 64-bit

Conflicts:
	libavcodec/x86/bswapdsp.asm

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-17 23:20:14 +02:00
Michael Niedermayer
c7c33ab721 Merge commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09' 
* commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09':
  configure: Factor out g722dsp module

Conflicts:
	configure
	libavcodec/arm/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-17 23:04:47 +02:00
Michael Niedermayer
65b0f7ce08 Merge commit 'a623aa0069dff586241ad2ffedcd45ed840e2553' 
* commit 'a623aa0069dff586241ad2ffedcd45ed840e2553':
  configure: Factor out wmv2dsp module

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-17 22:56:00 +02:00
Michael Niedermayer
115a9b5091 Merge commit 'd42191c78befc1983f23b1899b2dda513b72f1ed' 
* commit 'd42191c78befc1983f23b1899b2dda513b72f1ed':
  configure: Factor out vp8dsp module

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-17 22:45:34 +02:00
Michael Niedermayer
3500eccb8e Merge commit 'd4aea1aa4060fb5ba7f5f426823b697d2a5af08b' 
* commit 'd4aea1aa4060fb5ba7f5f426823b697d2a5af08b':
  configure: Factor out vp56dsp module

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-17 22:31:45 +02:00
Michael Niedermayer
fd29dd432c Merge commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418' 
* commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418':
  configure: Factor out rv34dsp module

Conflicts:
	libavcodec/Makefile
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-17 22:21:36 +02:00