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
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
Michael Niedermayer
141b9d5c3b
avcodec/h264_slice: update slice context linesizes when a new picture is allocated
...
previously they where only updated when decoding started and would thus have
been inconsistent for a longer period of time leaving more chances for
problems
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21 23:45:46 +01:00
Federico Tomassetti
cfe6461392
avfilter: Document avfilter_graph_alloc return value
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-03-21 23:18:15 +01:00
Federico Tomassetti
27aa1ff35a
oggdec: Check memory allocation
...
Bug-Id: CID 1257798 / CID 1257805
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-03-21 23:18:15 +01:00
Federico Tomassetti
93c1b04abf
mms: Check memory allocation
...
Bug-Id: CID 1258462
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-03-21 23:18:15 +01:00
Federico Tomassetti
d450cb07d9
avplay: Check memory allocation
...
Bug-Id: CID 1288294
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-03-21 23:18:14 +01:00
Federico Tomassetti
d3aa307da0
rmenc: Check memory allocation
...
Bug-Id: CID 1257832
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-03-21 23:18:14 +01:00
Federico Tomassetti
7ebb302229
swscale: Check memory allocation
...
Bug-Id: CID 1267890
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-03-21 23:18:11 +01:00
Michael Niedermayer
fa7c08d5e1
Merge commit 'c28ed1d743443e783537d279ae721be3bbdf7646'
...
* commit 'c28ed1d743443e783537d279ae721be3bbdf7646':
h264: move [uv]linesize to the per-slice context
Conflicts:
libavcodec/h264_mb.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21 23:16:36 +01:00
Michael Niedermayer
a6cb0534e2
Merge commit 'b53569e0681ff7bc99103ab4c961dbac3cc0fce6'
...
* commit 'b53569e0681ff7bc99103ab4c961dbac3cc0fce6':
h264_cabac: remove now unnecessary H264Context function parameters
Conflicts:
libavcodec/h264_cabac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21 23:13:25 +01:00
Michael Niedermayer
d8151a7e94
Merge commit 'a12d3188cbec15e22070e139fa5cc541da07e2c3'
...
* commit 'a12d3188cbec15e22070e139fa5cc541da07e2c3':
h264: use a smaller struct for the ref lists
Conflicts:
libavcodec/h264_direct.c
libavcodec/h264_mb.c
libavcodec/h264_picture.c
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21 23:05:34 +01:00
Michael Niedermayer
e970b576d2
Merge commit '94295106d20b32666a8c4e0d028ef79b9d3f3b7a'
...
* commit '94295106d20b32666a8c4e0d028ef79b9d3f3b7a':
h264_mb: remove an unused function parameter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21 21:43:07 +01:00
Michael Niedermayer
8c6370afe3
Merge commit '2b4c38d3c647f409080606ef02b3363ada00be2c'
...
* commit '2b4c38d3c647f409080606ef02b3363ada00be2c':
h264: drop some mpegvideo remnants from draw_horiz_band()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21 21:42:14 +01:00
Michael Niedermayer
0f8bb0efc3
Merge commit '5bf3c0fa49afd5bbf43aa841ff78007d72c80736'
...
* commit '5bf3c0fa49afd5bbf43aa841ff78007d72c80736':
h264: drop the now unused per-slice H264Contexts
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21 21:41:17 +01:00
Michael Niedermayer
8bdcec3111
Merge commit '51d8725a6e4c7f989d6f0f38b59cb54a2d72846c'
...
* commit '51d8725a6e4c7f989d6f0f38b59cb54a2d72846c':
h264: use the main H264Context as the parent for all slice contexts
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21 21:33:27 +01:00
Michael Niedermayer
b1e6d8a226
Merge commit '92e0b7342c0490894cbcea4461380321e0569de2'
...
* commit '92e0b7342c0490894cbcea4461380321e0569de2':
h264_slice: constify all the uses of H264Context during slice decoding
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21 21:32:33 +01:00
Ronald S. Bultje
1fd1f58bd6
vp9: make above buffer pointer 32-byte aligned.
...
Fixes ticket #4383
Signed-off-by: James Almer <jamrial@gmail.com>
2015-03-21 17:13:46 -03:00
Michael Niedermayer
84ae7294cb
Merge commit '3178f4d33ff62243f7cdddb081db516ea34396c9'
...
* commit '3178f4d33ff62243f7cdddb081db516ea34396c9':
h264: move rbsp_buffer into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_parser.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21 20:16:21 +01:00
Michael Niedermayer
830e548b9e
Merge commit '582683b6ac798ed2a004a4e2121b7bd47892bbfd'
...
* commit '582683b6ac798ed2a004a4e2121b7bd47892bbfd':
h264: move remaining ER stuff into the per-slice context
Conflicts:
libavcodec/h264.h
libavcodec/h264_picture.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21 20:00:34 +01:00
Michael Niedermayer
44309dd294
avcodec/mpegvideo: support mbskip_table==NULL in ff_print_debug_info2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21 19:28:56 +01:00