wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
75649 commits 40 branches 405 tags 230 MiB
Commit graph

75649 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt Oliver
ae58abeabb compat/w32pthreads: Add return values to match the simulated pthread functions. 2015-09-30 13:41:33 +10:00
Shawn Singh
733475160a libavformat/mov.c: Add parsing for DDTS atom for DTS audio 
The DDTS atom is defined in ETSI TS 102 114, v1.4.1, Annex E.
This is useful for DTS-HD formats, some of which cannot be
decoded by dcadec.c or libdcadec.

Signed-off-by: Shawn Singh <shawnsingh@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-30 05:05:17 +02:00
Christophe Gisquet
e3242c0219 dnxhddata: deduplicate table 
CID 1256 is specified as using the same table for luma and chroma,
which is the same as CID 1235 luma table. This is consistent with
the format supposedly being RGB, although most sequences seem to
actually be YCbCr-encoded.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-30 00:27:07 +02:00
Stefano Pigozzi
78cc19f15e videotoolbox: require hardware acceleration 
VideoToolbox also implements a software decoder for h264, and will fallback to
using it if the file cannot be decoded on the GPU. In these cases though,
we want the hwaccel to fail so that we can use the libavcodec software decoder
instead of the Apple one.

Signed-off-by: wm4 <nfxjfg@googlemail.com>
 2015-09-29 23:55:11 +02:00
Carl Eugen Hoyos
98ed0716fb lavf/rawenc: Force one stream for hevc and m4v. 2015-09-29 21:36:18 +02:00
Paul B Mahol
a019149249 avfilter/vf_atadenoise: do not use uninitialized data 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-09-29 20:50:20 +02:00
Ganesh Ajjanagadde
308e7484a3 avcodec/x86/rnd_template: silence -Wunused-function on --disable-mmx 
This silences some of the -Wunused-function warnings when compiled with --disable-mmx, e.g
http://fate.ffmpeg.org/log.cgi?time=20150919094617&log=compile&slot=x86_64-archlinux-gcc-disable-mmx.
Header guards are too brittle and ugly for this case.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-29 19:37:26 +02:00
Przemysław Sobala
01dd7e025c lavf/img2dec: Fix memory leak 
Fixes #4886

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-29 19:21:13 +02:00
Michael Niedermayer
ed18c49f5f fate: Add basic license header check 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-29 18:52:35 +02:00
Hendrik Leppkes
fc97b1f091 Merge commit '26e8fa3b50' 
* commit '26e8fa3b50':
  tiny_psnr: Use the correct abs() version

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 15:44:28 +02:00
Hendrik Leppkes
f35c4ede9e Merge commit 'c9943f00cf' 
* commit 'c9943f00cf':
  vf_framepack: Use av_image_copy() where appropriate

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 15:44:14 +02:00
Hendrik Leppkes
b03260fde0 Merge commit 'e94e651c76' 
* commit 'e94e651c76':
  dnxhddec: Enable frame threading

FFmpeg has much more threading modes for DNxHD

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 15:38:05 +02:00
Hendrik Leppkes
1342d7b2f9 Merge commit 'c49cbecbae' 
* commit 'c49cbecbae':
  dnxhddec: Decode and use interlace mb flag

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 15:36:06 +02:00
Hendrik Leppkes
b3bf41cb75 Merge commit 'c5e5e63062' 
* commit 'c5e5e63062':
  riff: Add support for RV40 codec in AVI

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 15:31:29 +02:00
Hendrik Leppkes
7255cf003e Merge commit 'b5e4f393b6' 
* commit 'b5e4f393b6':
  avconv: Make the private options discovery more manifest

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 15:30:48 +02:00
Hendrik Leppkes
e490fee6b9 Merge commit '3973f0f773' 
* commit '3973f0f773':
  Revert "avconv_opt: Allow printing private options"

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 15:29:46 +02:00
Hendrik Leppkes
773570a9dc Merge commit 'cf7d2f2d21' 
* commit 'cf7d2f2d21':
  lavc: Simplify checking quant bias option

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 15:27:59 +02:00
Hendrik Leppkes
24fea89983 Merge commit '84dfc426ce' 
* commit '84dfc426ce':
  avresample: Remove an unused variable

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 15:27:42 +02:00
Hendrik Leppkes
fe294b3403 Merge commit '4885bde318' 
* commit '4885bde318':
  motion_est_template: Fix undefined left shift of negative number

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 15:26:59 +02:00
Hendrik Leppkes
cbed8dbb7e Merge commit '977f41e274' 
* commit '977f41e274':
  mlpdec: Fix a undefined left shift of negative number

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 15:26:13 +02:00
Hendrik Leppkes
b01891a9f0 Merge commit '948f3c19a8' 
* commit '948f3c19a8':
  lavc: Make AVPacket.duration int64, and deprecate convergence_duration

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 15:22:52 +02:00
Ganesh Ajjanagadde
d3e5fbb140 avcodec/apedec: fix undefined left shifts of negative numbers 
This fixes -Wshift-negative-value reported with clang 3.7+, e.g
http://fate.ffmpeg.org/log.cgi?time=20150919172459&log=compile&slot=x86_64-darwin-clang-polly-notiling-3.7.
Note that the patch crucially depends on int >= 32 bits,
an assumption made in many places in the codebase.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-29 15:05:38 +02:00
Hendrik Leppkes
a2426798d6 Merge commit 'd00bb8addc' 
* commit 'd00bb8addc':
  mips: intreadwrite: Only execute that code for mips r1 or r2

Not merged, as FFmpeg has a separate condition to protect this code.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:35:07 +02:00
Hendrik Leppkes
c096226ae6 Merge commit '1016a75cf3' 
* commit '1016a75cf3':
  configure: mips: Support mips r6, r2 and r1

Not merge, as MIPS support in ffmpeg is handled
quite differently and I do not have an env to test.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:33:35 +02:00
Vittorio Giovara
26e8fa3b50 tiny_psnr: Use the correct abs() version 2015-09-29 14:33:01 +02:00
Vittorio Giovara
c9943f00cf vf_framepack: Use av_image_copy() where appropriate 
This correctly adjust chroma subsampling for column interleaved mode,
and allows future high bitdepth support.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-09-29 14:33:01 +02:00
Vittorio Giovara
e94e651c76 dnxhddec: Enable frame threading 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-09-29 14:33:01 +02:00
Christophe Gisquet
c49cbecbae dnxhddec: Decode and use interlace mb flag 
This bit is 1 in some samples, and seems to coincide with interlaced
mbs and CID1260. 2008 specs do not know about it, and maintain qscale
is 11 bits. This looks oversized, but may help larger bitdepths.

Currently, it leads to an obviously incorrect qscale value, meaning
its syntax is shifted by 1. However, reading 11 bits also leads to
obviously incorrect decoding: qscale seems to be 10 bits.

However, as most profiles still have 11bits qscale, the feature is
restricted to the CID1260 profile (this flag is dependent on
a higher-level flag located in the header).

The encoder writes 12 bits of syntax, last and first bits always 0,
which is now somewhat inconsistent with the decoder, but ends up with
the same effect (progressive + reserved bit).

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-09-29 14:33:01 +02:00
Thierry Foucu
c5e5e63062 riff: Add support for RV40 codec in AVI 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-29 14:33:01 +02:00
Vittorio Giovara
b5e4f393b6 avconv: Make the private options discovery more manifest 2015-09-29 14:33:01 +02:00
Vittorio Giovara
3973f0f773 Revert "avconv_opt: Allow printing private options" 
This reverts commit 7bb1c1bfd2.
A long existing version in the form of avconv -h decoder=h264 already
existed, and this just duplicates it.
 2015-09-29 14:33:01 +02:00
Vittorio Giovara
cf7d2f2d21 lavc: Simplify checking quant bias option 2015-09-29 14:33:01 +02:00
Ganesh Ajjanagadde
84dfc426ce avresample: Remove an unused variable 
This fixes a -Wunused-variable warning.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
 2015-09-29 14:33:01 +02:00
Ganesh Ajjanagadde
4885bde318 motion_est_template: Fix undefined left shift of negative number 
This fixes a -Wshift-negative-value warning reported with clang 3.7+.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
 2015-09-29 14:33:00 +02:00
Ganesh Ajjanagadde
977f41e274 mlpdec: Fix a undefined left shift of negative number 
This fixes a -Wshift-negative-value warning reported with clang 3.7+.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
 2015-09-29 14:33:00 +02:00
wm4
948f3c19a8 lavc: Make AVPacket.duration int64, and deprecate convergence_duration 
Note that convergence_duration had another meaning, one which was in
practice never used. The only real use for it was a 64 bit replacement
for the duration field. It's better just to make duration 64 bits, and
to get rid of it.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-09-29 14:33:00 +02:00
Hendrik Leppkes
071f6edb98 Merge commit '678f788fea' 
* commit '678f788fea':
  configure: Set the initial ldflags to match the cflags

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:24:35 +02:00
Hendrik Leppkes
4d9b78a875 Merge commit '1a4c5fe560' 
* commit '1a4c5fe560':
  libopenh264enc: Use av_log() to log messages

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:23:45 +02:00
Hendrik Leppkes
27673f1bea Merge commit '8aecec8402' 
* commit '8aecec8402':
  qsvdec: make ff_qsv_decode_init() static

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:20:05 +02:00
Hendrik Leppkes
b1284a4b4a Merge commit '539e5ac2ec' 
* commit '539e5ac2ec':
  examples/qsvdec: free the lavc decoder before closing MFX/VAAPI

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:17:29 +02:00
Hendrik Leppkes
d0a1605134 Merge commit '3ee462dca1' 
* commit '3ee462dca1':
  examples/qsvdec: do not free the surfaces in the frame_free() callback

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:17:23 +02:00
Hendrik Leppkes
9457a11a22 Merge commit '2c32eace5e' 
* commit '2c32eace5e':
  qsvdec: close the MFX decoder on uninit

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:17:09 +02:00
Hendrik Leppkes
029aa8ff14 Merge commit 'd0c8c380ec' 
* commit 'd0c8c380ec':
  qsv: document AVQSVContext members

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:14:10 +02:00
Hendrik Leppkes
6668214521 Merge commit '5d2daebf3c' 
* commit '5d2daebf3c':
  qsvenc: mark the encoders as INIT_CLEANUP

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:12:47 +02:00
Hendrik Leppkes
49a25d02dd Merge commit '83847cc8fa' 
* commit '83847cc8fa':
  qsvenc: do not try to close the encoder if the session is NULL

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:10:25 +02:00
Hendrik Leppkes
4554178f07 Merge commit '741b352b16' 
* commit '741b352b16':
  qsvdec: list supported pixel formats

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 13:53:42 +02:00
Hendrik Leppkes
c36e85b3d9 Merge commit 'ae25413daf' 
* commit 'ae25413daf':
  lavfi: do not exclude hwaccel formats from ff_all_formats()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 13:48:58 +02:00
Hendrik Leppkes
88dbdf4845 Merge commit 'cc28552100' 
* commit 'cc28552100':
  checkasm/x86: Correctly handle variadic functions

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 13:48:24 +02:00
Hendrik Leppkes
fd0fa9af80 Merge commit '5405584b7b' 
* commit '5405584b7b':
  checkasm: Use a self-balancing tree

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 13:48:05 +02:00
Hendrik Leppkes
d0bf83ff1d Merge commit 'a41e5e192e' 
* commit 'a41e5e192e':
  vdpau: fix constrained baseline fallback

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 13:45:38 +02:00