ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-28 17:20:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,222 Commits 37 Branches 398 Tags 500 MiB
3000183732
Commit Graph

71222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
153073201c Merge commit 'a8c99205ca8703bd849efae13fcf844315c7147d' 
* commit 'a8c99205ca8703bd849efae13fcf844315c7147d':
  avisynth: Fix compilation against current 2.6 header(s).

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-24 11:40:12 +01:00
Stephen Hutchinson
1188119624 avisynth: update documentation about the avisynth_c.h header 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-03-24 10:31:04 +01:00
Stephen Hutchinson
a8c99205ca avisynth: Fix compilation against current 2.6 header(s). 
AviSynth 2.6 (and by extension, AviSynth+) moves these functions
into AVSC_API. This requires both adjusting their normal use,
and for AvxSynth, adjusting the position/use of the USING_AVISYNTH
ifdefs.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-03-24 10:31:04 +01:00
Carl Eugen Hoyos
b76df6efb6 lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing. 
Fixes remuxing of DVBSUB to mkv.
 2015-03-24 10:07:18 +01:00
Carl Eugen Hoyos
c5d0148c7e doc: Remove non-existing decklink options. 
Reported-by: Bostjan Hamler
 2015-03-24 09:54:04 +01:00
Michael Niedermayer
a2dd2d7998 Merge commit '1ddd3e23a49b9eec11c62dca018238cf7349c90f' 
* commit '1ddd3e23a49b9eec11c62dca018238cf7349c90f':
  vaapi_h264: fix slice data offset

See: aba3030a55
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-24 02:48:17 +01:00
Michael Niedermayer
70cf40f9eb Merge commit 'ae4f5d944cce431b1f4715c863122355e1d78007' 
* commit 'ae4f5d944cce431b1f4715c863122355e1d78007':
  dxva2_h264: fix slice offset in long slice structs

See: cf1fba0fb8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-24 02:31:26 +01:00
Michael Niedermayer
2850131f2c Merge commit 'b21af32aed7e343f962753943e9f16baedfb1750' 
* commit 'b21af32aed7e343f962753943e9f16baedfb1750':
  lavc: Prefer x264 over openh264 if both libraries are available

See: ddae03f69b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-24 02:23:29 +01:00
Michael Niedermayer
3e39956198 Merge commit '312a9ef04bf6b55e68e4a61694b169cd3cc69bb8' 
* commit '312a9ef04bf6b55e68e4a61694b169cd3cc69bb8':
  pixfmt: Update documentation with prefixed pixel formats

Conflicts:
	libavutil/pixfmt.h

See: 231e33f050
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-24 01:56:11 +01:00
Michael Niedermayer
d280d43c26 Merge commit '592a04054e6423be5050efd2bceece48b10b9c1d' 
* commit '592a04054e6423be5050efd2bceece48b10b9c1d':
  pixdesc: Replace a few leftover instances of non AV-prefixed flags

Conflicts:
	libavutil/pixdesc.c

See: c7c71f95f8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-24 01:47:01 +01:00
Michael Niedermayer
cceb737936 Merge commit '7419b34825c20d52f667da2fbe4dc710ec8398f8' 
* commit '7419b34825c20d52f667da2fbe4dc710ec8398f8':
  fate: Add test for tscc2 in mov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-24 01:24:13 +01:00
Michael Niedermayer
dfea1acb21 Merge commit 'e4fe535d12f4f30df2dd672e30304af112a5a827' 
* commit 'e4fe535d12f4f30df2dd672e30304af112a5a827':
  mov: Write the display matrix in order

Conflicts:
	libavformat/mov.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-24 01:14:31 +01:00
Mark Reid
001b28b021 libavformat/mxfenc: add container duration and package name to primer pack 
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-23 22:09:46 +01:00
Hendrik Leppkes
1ddd3e23a4 vaapi_h264: fix slice data offset 2015-03-23 20:53:29 +00:00
Hendrik Leppkes
ae4f5d944c dxva2_h264: fix slice offset in long slice structs 2015-03-23 20:53:29 +00:00
Michael Niedermayer
b21af32aed lavc: Prefer x264 over openh264 if both libraries are available 2015-03-23 20:53:29 +00:00
Vittorio Giovara
312a9ef04b pixfmt: Update documentation with prefixed pixel formats 2015-03-23 20:53:28 +00:00
Vittorio Giovara
592a04054e pixdesc: Replace a few leftover instances of non AV-prefixed flags 2015-03-23 20:53:28 +00:00
Vittorio Giovara
7419b34825 fate: Add test for tscc2 in mov 
Rename the existing tscc2 test.
 2015-03-23 20:53:28 +00:00
Vittorio Giovara
e4fe535d12 mov: Write the display matrix in order 
This will allow to copy the matrix as is and it is just cleaner to keep
the matrix in the same order specified by the mov standard (which is
also explicitly described in the documentation).

In order to preserve compatibility, flip the angle sign in the display API
av_display_rotation_set() and av_display_rotation_get(), and improve the
documentation mentioning the rotation direction.
 2015-03-23 20:53:28 +00:00
Michael Niedermayer
ad3c5ff347 Merge commit 'e0046bc9c96150fa06146ace9093f06857dd7b23' 
* commit 'e0046bc9c96150fa06146ace9093f06857dd7b23':
  movenc: Write the make and model metadata keys for mov style files

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-23 20:33:09 +01:00
Michael Niedermayer
67ceb42d39 avfilter/vf_stereo3d: Change enum to int, which is accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-23 19:31:17 +01:00
Michael Niedermayer
744c9b49a5 avutil/frame: Add some very basic documentation for AVFrameSideData 
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-23 18:46:26 +01:00
Timothy Gu
c3d0edd406 doc: Use @lisp where appropriate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-23 17:21:38 +01:00
Timothy Gu
ecba41bfd3 doc: More semantic markup using @samp and @var where appropriate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-23 17:08:08 +01:00
Hendrik Leppkes
aba3030a55 vaapi_h264: fix slice data offset 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-23 16:12:08 +01:00
Hendrik Leppkes
cf1fba0fb8 dxva2_h264: fix slice offset in long slice structs 
Fixes Ticket #4384

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-23 16:12:08 +01:00
Timothy Gu
641ef7d4f7 doc/fate: better formatting 
The initial spaces get ignored anyway so let's be consistent with other docs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-23 13:16:42 +01:00
Martin Storsjö
e0046bc9c9 movenc: Write the make and model metadata keys for mov style files 
These are essential allowing QuickTime to keep detecting content
as slow-motion - this allows preserving them on stream copy.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-03-23 12:43:35 +02:00
Michael Niedermayer
83020f8978 postproc/postprocess_template: split 2nd blockgroup loop out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-23 00:41:41 +01:00
Michael Niedermayer
d9e3fe8c22 postproc/postprocess_template: split first part of block loop 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-23 00:33:16 +01:00
Michael Niedermayer
2a9b9579ab postproc/postprocess_template: Move QP initialization down 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-23 00:24:46 +01:00
Michael Niedermayer
330113b032 postproc/postprocess_template: Remove dead code and comments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-23 00:22:43 +01:00
Michael Niedermayer
fc90d1502a bpostproc/postprocess_template: drop avoidable #ifdef 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-23 00:16:07 +01:00
Michael Niedermayer
93f4538363 postproc/postprocess_template: split loop in 2 (block groups of 4, blocks) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-23 00:15:58 +01:00
Michael Niedermayer
7517e932ff avcodec/snow: fix support for odd dimensions 
Fixes Ticket3914

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-22 23:34:53 +01:00
Michael Niedermayer
a089d567f1 avcodec/jpeglsdec: support PAL1-PAL7 
Fixes Ticket3933

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-22 20:31:03 +01:00
Michael Niedermayer
74097e0902 avfilter/vf_signalstats: Change enum to int, which is accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-22 17:31:34 +01:00
Michael Niedermayer
3a23ec0daa avfilter/vf_setfield: Change enum to int, which is accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-22 17:30:24 +01:00
Michael Niedermayer
14bc7aaa86 Revert "avformat/flvenc: Allow muxing video codecs which are not explicitly supported by the muxer" 
This commit has no known use case ATM as there are no unsupported video codecs in flv and could
theoretically be use to generate broken files allthough that would be not entirely easy as
tags/codecs still get sanity checked

This reverts commit 76f4b11780.
 2015-03-22 17:19:25 +01:00
Michael Niedermayer
76f4b11780 avformat/flvenc: Allow muxing video codecs which are not explicitly supported by the muxer 
This allows stream copying video codecs before they are explicitly
supported. The same feature was in the past useful for audio codecs
in flv

This partly reverts the changes from 735ab7c5e0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-22 16:20:14 +01:00
Michael Niedermayer
797ba4d53b avcodec/h264_cavlc: Drop local_ref_count 
This basically switches to the implementation from f6f7d15041
which seems faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-22 14:39:38 +01:00
Michael Niedermayer
563a8b4aac avcodec/h264_cabac: Drop local_ref_count 
7966 -> 7897 decicycles

This basically switches to the implementation from f6f7d15041
which seems faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-22 14:39:32 +01:00
Michael Niedermayer
aa65ff2adf Merge commit 'cfe64613923a2d47644a87386146ada1f9f6b659' 
* commit 'cfe64613923a2d47644a87386146ada1f9f6b659':
  avfilter: Document avfilter_graph_alloc return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-22 04:03:20 +01:00
Michael Niedermayer
cff55cfe17 Merge commit '27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f' 
* commit '27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f':
  oggdec: Check memory allocation

Conflicts:
	libavformat/oggdec.c

See: 9b8152bf04 an others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-22 04:02:25 +01:00
Michael Niedermayer
c75681aba3 Merge commit '93c1b04abfc0dd31211a18bf2c0041d69cd16919' 
* commit '93c1b04abfc0dd31211a18bf2c0041d69cd16919':
  mms: Check memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-22 03:52:37 +01:00
Michael Niedermayer
a821617b5a Merge commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7' 
* commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7':
  avplay: Check memory allocation

Conflicts:
	ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-22 03:51:49 +01:00
Michael Niedermayer
a3f5a8c3e0 Merge commit 'd3aa307da076e8820298b2c59ec5d6ff01a5e374' 
* commit 'd3aa307da076e8820298b2c59ec5d6ff01a5e374':
  rmenc: Check memory allocation

See: 5683810302
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-22 03:50:17 +01:00
Michael Niedermayer
324067d18b Merge commit '7ebb3022297aa00afda6800105684b8303f2608e' 
* commit '7ebb3022297aa00afda6800105684b8303f2608e':
  swscale: Check memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-22 03:40:37 +01:00
Michael Niedermayer
0346783c98 avcodec/h264.h: Drop unused macro 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-22 00:29:01 +01:00