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

74876 Commits

Author SHA1 Message Date
Hendrik Leppkes f30132f9c4 Merge commit 'a4615572b576d3ef7ee2f11529d935e61bf4ebb8' 
* commit 'a4615572b576d3ef7ee2f11529d935e61bf4ebb8':
  dnxhddata: Merge a few duplicated RUN tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:31:52 +02:00
Hendrik Leppkes f19a283867 Merge commit 'efbfb1ad1112cea79bef51fd9f30c0c94735abfc' 
* commit 'efbfb1ad1112cea79bef51fd9f30c0c94735abfc':
  dnxhddata: Group together RUN-related tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:29:54 +02:00
Hendrik Leppkes 305f461754 Merge commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1' 
* commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1':
  dnxhddata: Merge a few duplicated DC tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:27:02 +02:00
Hendrik Leppkes 3b0af76c1b Merge commit '5e129ed655bff5b6d90355c0b713d7aaba3898ec' 
* commit '5e129ed655bff5b6d90355c0b713d7aaba3898ec':
  dnxhddata: Group together DC-related tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:26:14 +02:00
Hendrik Leppkes 3f491224fe Merge commit 'd3ae4c65942d67a294fd56eabbbdcce6756fab5f' 
* commit 'd3ae4c65942d67a294fd56eabbbdcce6756fab5f':
  dnxhddata: List the reused tables in a comment

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:19:41 +02:00
Hendrik Leppkes bd074bde02 Merge commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b' 
* commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b':
  dnxhddata: Keep a single CID in the table names

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:17:37 +02:00
Michael Niedermayer 81a8701eb5 avformat/oggenc: Check segments_count for headers too 
Fixes infinite loop and segfault in ogg_buffer_data()
Fixes Ticket4806

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-27 04:28:21 +02:00
Timothy Gu da0e76955a ffmpeg_opt: Add -hwaccels option that lists all supported hwaccels 2015-08-26 18:46:20 -07:00
Carl Eugen Hoyos 33908f0837 lavf/mov: Support unusual alac files without frma and alac atoms. 
Fixes ticket #4747.
 2015-08-27 03:29:29 +02:00
Carl Eugen Hoyos 7f9656f10d lavc/dnxhdenc: Fix ibias default. 
Fixes a regression since a8ab64d2 reported by Rens Dijkshoorn, rens offlinemedia nl.
 2015-08-27 02:59:43 +02:00
Paul B Mahol 319440e54f avfilter: add hstack & vstack filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-08-26 11:16:51 +00:00
Paul B Mahol 0190c372ef avfilter/framesync: allocate FFFrameSyncIn internally 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-08-26 11:12:23 +00:00
Paul B Mahol a16251a6d0 avfilter/vf_histogram: fix bug in checking pixel format flags 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-08-26 11:11:26 +00:00
Paul B Mahol 3fbc9deb95 avfilter/vf_vectorscope: fix bug in checking pixel format flags 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-08-26 11:11:26 +00:00
Luca Barbato b1abd2aaf9 vf_scale: Add an option to pass the scaler params 
Reported-By: zehan@magicpony.technology
 2015-08-26 12:13:23 +02:00
Ganesh Ajjanagadde 6455e4fb5b configure: do not fork off grep subprocess while testing for whitespace 
grep is not necessary for the functionality.
This avoids an unnecessary fork.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-26 11:53:15 +02:00
Paul B Mahol 47df871645 avfilter/af_aphaser: use the name 's' for the pointer to the private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-08-26 09:49:02 +00:00
Timothy Gu c23999be13 avconv_opt: Add an option that lists all supported hwaccels 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-08-26 05:18:43 +02:00
Timothy Gu 629d4c5b4d avconv_opt: Add missing comma 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-08-26 05:03:14 +02:00
Paul B Mahol e030d3c61f avfilter/vf_blend: use the name 's' for the pointer to the private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-08-25 18:16:55 +00:00
James Almer 4c39892b67 avcodec/vdpau: fix compilation of mpeg1/mpeg4/vc1 decoders when h264 is disabled 
Tested-by: wm4 <nfxjfg@googlemail.com>
Tested-by: Philip Langdale <philipl@overt.org>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-08-25 23:58:54 -03:00
Michael Niedermayer dda6925357 avformat/segment: Do not free the filename twice 
Bug introduced in 83a508cda5

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-26 03:50:52 +02:00
Timothy Gu 68a9c8ac77 swscale: Silence an unused variable warning 
Also remove a pair of extraneous ifdeffery.
 2015-08-25 17:40:06 -07:00
Timothy Gu b144008c1b ffmpeg_opt: Add missing comma 2015-08-25 16:49:51 -07:00
Timothy Gu 0c6a92a447 matroskaenc: Fix indentation 
Found-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-25 16:03:49 -07:00
Stephan Holljes 4f860848ab lavf/http: Fix parsing http request data to not read over '\0'. 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-25 19:51:13 +02:00
wm4 94a4be85a1 configure: aac encoder requires lpc 
Fixes compilation with --disable-encoders --enable-encoder=aac
 2015-08-25 19:48:11 +02:00
Luca Barbato e176639bcb webm: Explicitly select libvpx, libopus and libvorbis encoders 
And update the preference for the newer codecs now that the libraries
seem stable and widespread enough.

Bug-Id: 695
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-08-25 19:47:43 +02:00
Luca Barbato 413d4e54a9 nvenc: Properly free the fifos 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-08-25 19:47:43 +02:00
Luca Barbato 2157df425b hlsenc: Support outputting specific versions 
Right now only version 2 and version 3 are supported.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-08-25 19:43:58 +02:00
Henrik Gramner 33a58d7bf4 checkasm: Fix floating point arguments on 64-bit Windows 2015-08-25 19:34:46 +02:00
Vesselin Bontchev 4cd1d2314b avformat/aa: use correct format specifier in sscanf 
This demuxer was broken on a large number of platforms due to usage of wrong
format specifier in sscanf. This patch fixes the problem, and also adds some
debug logging to reduce future debugging pain.
 2015-08-25 12:44:20 +00:00
Carl Eugen Hoyos 83a508cda5 lavf/segment: Fix memleak. 
Reviewed-by: Stefano Sabatini
Reviewed-by: Ganesh Ajjanagadde
 2015-08-25 13:36:24 +02:00
Michael Niedermayer d65b9114f3 avformat/file: Check for lstat() instead of dirent.h 
Fixes build on mingw

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-25 13:08:44 +02:00
Paul B Mahol 1b1c4030ea fate: add tests for vectorscope filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-08-25 10:13:03 +00:00
Carl Eugen Hoyos 91619d195b lavf/dnxhd: Autodetect more valid files. 2015-08-25 12:07:38 +02:00
Mariusz Szczepańczyk 1f4c62e84e lavf/file: check for dirent.h support 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-25 02:06:06 +02:00
Lukasz Marek d39a9b01e2 lavf/file: implement directory listing callbacks 
Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-25 02:04:34 +02:00
Ganesh Ajjanagadde 060102389e configure: do not fork off grep subprocess in probe_cc 
grep is not required for the functionality in this instance.
This avoids an unnecessary fork, and also avoids a duplicated dumpversion call.
Furthermore, it also corrects behavior when no minor version number is present, see e.g
https://github.com/joyent/node/pull/25671.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-25 00:31:25 +02:00
Michael Niedermayer fa9af304f0 avcodec/mjpegdec: Remove message asking for a non mod 16 AMV sample 
Ticket4770 contains such a sample and it decodes fine

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-24 19:50:01 +02:00
Paul B Mahol 2f731d46f0 avfilter/vf_vectorscope: add options with shorter name 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-08-24 14:21:26 +00:00
Paul B Mahol c34c050303 avfilter/vf_vectorscope: make intensity user configurable 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-08-24 14:19:30 +00:00
Vittorio Giovara d68705c975 dnxhddata: Add tables for missing DNx100 profiles 
1440x1080@8 progressive (1259) and interlaced (1260).

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-08-24 13:20:10 +02:00
Vittorio Giovara a4615572b5 dnxhddata: Merge a few duplicated RUN tables 2015-08-24 13:20:04 +02:00
Vittorio Giovara efbfb1ad11 dnxhddata: Group together RUN-related tables 
This helps in finding duplicates.
 2015-08-24 13:19:58 +02:00
Vittorio Giovara 403ea4ac72 dnxhddata: Merge a few duplicated DC tables 2015-08-24 13:19:43 +02:00
Vittorio Giovara 5e129ed655 dnxhddata: Group together DC-related tables 
This helps in finding duplicates.
 2015-08-24 13:19:36 +02:00
Vittorio Giovara d3ae4c6594 dnxhddata: List the reused tables in a comment 2015-08-24 13:19:28 +02:00
Vittorio Giovara fdd021884d dnxhddata: Keep a single CID in the table names 
Use a comment to list the reused tables, since it's more flexible than a
table name to keep information like this. The list will expand in later
commits.
 2015-08-24 13:19:06 +02:00
Michael Niedermayer ee155c18a2 avformat/hevc: Check num_long_term_ref_pics_sps to avoid potentially long loops 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-24 13:04:38 +02:00