]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Tue, 24 Mar 2015 01:47:50 +0000 (02:47 +0100)]
Michael Niedermayer [Tue, 24 Mar 2015 01:30:47 +0000 (02:30 +0100)]
Merge commit '
ae4f5d944cce431b1f4715c863122355e1d78007 '
* commit '
ae4f5d944cce431b1f4715c863122355e1d78007 ':
dxva2_h264: fix slice offset in long slice structs
See:
cf1fba0fb83ba4d6ddd0a2432ea5e5e6f8c10aa2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Mar 2015 01:06:44 +0000 (02:06 +0100)]
Merge commit '
b21af32aed7e343f962753943e9f16baedfb1750 '
* commit '
b21af32aed7e343f962753943e9f16baedfb1750 ':
lavc: Prefer x264 over openh264 if both libraries are available
See:
ddae03f69bc1c6ec97c028c91837710944427b83
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Mar 2015 00:55:19 +0000 (01:55 +0100)]
Merge commit '
312a9ef04bf6b55e68e4a61694b169cd3cc69bb8 '
* commit '
312a9ef04bf6b55e68e4a61694b169cd3cc69bb8 ':
pixfmt: Update documentation with prefixed pixel formats
Conflicts:
libavutil/pixfmt.h
See:
231e33f050386e170cba33188df7b822b16ca099
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Mar 2015 00:45:43 +0000 (01:45 +0100)]
Merge commit '
592a04054e6423be5050efd2bceece48b10b9c1d '
* commit '
592a04054e6423be5050efd2bceece48b10b9c1d ':
pixdesc: Replace a few leftover instances of non AV-prefixed flags
Conflicts:
libavutil/pixdesc.c
See:
c7c71f95f8d3e98babf8b6b7f1edc49f14e2c4c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Mar 2015 00:24:04 +0000 (01:24 +0100)]
Merge commit '
7419b34825c20d52f667da2fbe4dc710ec8398f8 '
* commit '
7419b34825c20d52f667da2fbe4dc710ec8398f8 ':
fate: Add test for tscc2 in mov
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 24 Mar 2015 00:14:31 +0000 (01:14 +0100)]
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>
Mark Reid [Sat, 21 Mar 2015 23:45:27 +0000 (16:45 -0700)]
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>
Hendrik Leppkes [Mon, 23 Mar 2015 13:16:45 +0000 (14:16 +0100)]
vaapi_h264: fix slice data offset
Hendrik Leppkes [Mon, 23 Mar 2015 13:16:44 +0000 (14:16 +0100)]
dxva2_h264: fix slice offset in long slice structs
Michael Niedermayer [Tue, 17 Mar 2015 14:16:58 +0000 (14:16 +0000)]
lavc: Prefer x264 over openh264 if both libraries are available
Vittorio Giovara [Wed, 18 Mar 2015 11:10:40 +0000 (11:10 +0000)]
pixfmt: Update documentation with prefixed pixel formats
Vittorio Giovara [Wed, 18 Mar 2015 11:10:39 +0000 (11:10 +0000)]
pixdesc: Replace a few leftover instances of non AV-prefixed flags
Vittorio Giovara [Wed, 18 Mar 2015 00:48:18 +0000 (00:48 +0000)]
fate: Add test for tscc2 in mov
Rename the existing tscc2 test.
Vittorio Giovara [Tue, 17 Mar 2015 17:38:48 +0000 (17:38 +0000)]
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.
Michael Niedermayer [Mon, 23 Mar 2015 19:33:09 +0000 (20:33 +0100)]
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>
Michael Niedermayer [Mon, 23 Mar 2015 18:31:17 +0000 (19:31 +0100)]
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>
Michael Niedermayer [Mon, 23 Mar 2015 17:34:30 +0000 (18:34 +0100)]
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>
Timothy Gu [Mon, 23 Mar 2015 03:47:19 +0000 (20:47 -0700)]
doc: Use @lisp where appropriate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 23 Mar 2015 03:47:18 +0000 (20:47 -0700)]
doc: More semantic markup using @samp and @var where appropriate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Mon, 23 Mar 2015 14:58:27 +0000 (15:58 +0100)]
vaapi_h264: fix slice data offset
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Mon, 23 Mar 2015 14:58:26 +0000 (15:58 +0100)]
dxva2_h264: fix slice offset in long slice structs
Fixes Ticket #4384
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 23 Mar 2015 03:47:16 +0000 (20:47 -0700)]
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>
Martin Storsjö [Fri, 21 Nov 2014 22:53:42 +0000 (00:53 +0200)]
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>
Michael Niedermayer [Sun, 22 Mar 2015 23:41:41 +0000 (00:41 +0100)]
postproc/postprocess_template: split 2nd blockgroup loop out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 23:26:42 +0000 (00:26 +0100)]
postproc/postprocess_template: split first part of block loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 23:24:46 +0000 (00:24 +0100)]
postproc/postprocess_template: Move QP initialization down
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 23:22:43 +0000 (00:22 +0100)]
postproc/postprocess_template: Remove dead code and comments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 23:16:07 +0000 (00:16 +0100)]
bpostproc/postprocess_template: drop avoidable #ifdef
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 23:02:51 +0000 (00:02 +0100)]
postproc/postprocess_template: split loop in 2 (block groups of 4, blocks)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 22:07:03 +0000 (23:07 +0100)]
avcodec/snow: fix support for odd dimensions
Fixes Ticket3914
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 19:31:03 +0000 (20:31 +0100)]
avcodec/jpeglsdec: support PAL1-PAL7
Fixes Ticket3933
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 16:31:34 +0000 (17:31 +0100)]
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>
Michael Niedermayer [Sun, 22 Mar 2015 16:23:38 +0000 (17:23 +0100)]
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>
Michael Niedermayer [Sun, 22 Mar 2015 16:19:25 +0000 (17:19 +0100)]
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
76f4b117807c30a528539fc5c7a7e35cb288cfcf .
Michael Niedermayer [Fri, 6 Mar 2015 01:51:14 +0000 (02:51 +0100)]
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
735ab7c5e04e2316afbd56643c13de17a7ac89cd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 13:30:51 +0000 (14:30 +0100)]
avcodec/h264_cavlc: Drop local_ref_count
This basically switches to the implementation from
f6f7d1504134683c435e2c7d804279d982e52bb4
which seems faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 13:17:59 +0000 (14:17 +0100)]
avcodec/h264_cabac: Drop local_ref_count
7966 -> 7897 decicycles
This basically switches to the implementation from
f6f7d1504134683c435e2c7d804279d982e52bb4
which seems faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 03:03:06 +0000 (04:03 +0100)]
Merge commit '
cfe64613923a2d47644a87386146ada1f9f6b659 '
* commit '
cfe64613923a2d47644a87386146ada1f9f6b659 ':
avfilter: Document avfilter_graph_alloc return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 03:00:56 +0000 (04:00 +0100)]
Merge commit '
27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f '
* commit '
27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f ':
oggdec: Check memory allocation
Conflicts:
libavformat/oggdec.c
See:
9b8152bf047bbebe4495b993258591687bcdd36d an others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 02:52:17 +0000 (03:52 +0100)]
Merge commit '
93c1b04abfc0dd31211a18bf2c0041d69cd16919 '
* commit '
93c1b04abfc0dd31211a18bf2c0041d69cd16919 ':
mms: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 02:51:49 +0000 (03:51 +0100)]
Merge commit '
d450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7 '
* commit '
d450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7 ':
avplay: Check memory allocation
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 22 Mar 2015 02:48:25 +0000 (03:48 +0100)]
Michael Niedermayer [Sun, 22 Mar 2015 02:40:17 +0000 (03:40 +0100)]
Merge commit '
7ebb3022297aa00afda6800105684b8303f2608e '
* commit '
7ebb3022297aa00afda6800105684b8303f2608e ':
swscale: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 23:27:32 +0000 (00:27 +0100)]
avcodec/h264.h: Drop unused macro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 22:45:46 +0000 (23:45 +0100)]
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>
Federico Tomassetti [Sat, 21 Mar 2015 10:44:57 +0000 (10:44 +0000)]
avfilter: Document avfilter_graph_alloc return value
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Federico Tomassetti [Sat, 21 Mar 2015 10:44:59 +0000 (10:44 +0000)]
oggdec: Check memory allocation
Bug-Id: CID
1257798 / CID
1257805
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Federico Tomassetti [Sat, 21 Mar 2015 10:44:58 +0000 (10:44 +0000)]
mms: Check memory allocation
Bug-Id: CID
1258462
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Federico Tomassetti [Sat, 21 Mar 2015 10:44:56 +0000 (10:44 +0000)]
avplay: Check memory allocation
Bug-Id: CID
1288294
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Federico Tomassetti [Sat, 21 Mar 2015 10:45:00 +0000 (10:45 +0000)]
rmenc: Check memory allocation
Bug-Id: CID
1257832
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Federico Tomassetti [Sat, 21 Mar 2015 10:45:01 +0000 (10:45 +0000)]
swscale: Check memory allocation
Bug-Id: CID
1267890
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Sat, 21 Mar 2015 22:16:36 +0000 (23:16 +0100)]
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>
Michael Niedermayer [Sat, 21 Mar 2015 22:13:25 +0000 (23:13 +0100)]
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>
Michael Niedermayer [Sat, 21 Mar 2015 21:08:19 +0000 (22:08 +0100)]
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>
Michael Niedermayer [Sat, 21 Mar 2015 20:43:03 +0000 (21:43 +0100)]
Merge commit '
94295106d20b32666a8c4e0d028ef79b9d3f3b7a '
* commit '
94295106d20b32666a8c4e0d028ef79b9d3f3b7a ':
h264_mb: remove an unused function parameter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 20:42:10 +0000 (21:42 +0100)]
Merge commit '
2b4c38d3c647f409080606ef02b3363ada00be2c '
* commit '
2b4c38d3c647f409080606ef02b3363ada00be2c ':
h264: drop some mpegvideo remnants from draw_horiz_band()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 20:41:17 +0000 (21:41 +0100)]
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>
Michael Niedermayer [Sat, 21 Mar 2015 20:33:27 +0000 (21:33 +0100)]
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>
Michael Niedermayer [Sat, 21 Mar 2015 19:22:34 +0000 (20:22 +0100)]
Merge commit '
92e0b7342c0490894cbcea4461380321e0569de2 '
* commit '
92e0b7342c0490894cbcea4461380321e0569de2 ':
h264_slice: constify all the uses of H264Context during slice decoding
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 21 Mar 2015 20:12:48 +0000 (17:12 -0300)]
vp9: make above buffer pointer 32-byte aligned.
Fixes ticket #4383
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Sat, 21 Mar 2015 19:10:49 +0000 (20:10 +0100)]
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>
Michael Niedermayer [Sat, 21 Mar 2015 19:00:34 +0000 (20:00 +0100)]
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>
Michael Niedermayer [Sat, 21 Mar 2015 18:28:56 +0000 (19:28 +0100)]
avcodec/mpegvideo: support mbskip_table==NULL in ff_print_debug_info2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 18:24:03 +0000 (19:24 +0100)]
avcodec/error_resilience: Fix mbskip_table==NULL codepath
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 18:03:04 +0000 (19:03 +0100)]
Merge commit '
5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04 '
* commit '
5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04 ':
error_resilience: do not require mbintra/skip tables
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 17:58:59 +0000 (18:58 +0100)]
Merge commit '
c377e04d8aa74d030672e9a4788a700b0695fc14 '
* commit '
c377e04d8aa74d030672e9a4788a700b0695fc14 ':
h264: move top_borders into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 17:47:19 +0000 (18:47 +0100)]
Merge commit '
36d04801ba9d8622c2d759c172aea18561bac74d '
* commit '
36d04801ba9d8622c2d759c172aea18561bac74d ':
h264: move the scratch buffers into the per-slice context
Conflicts:
libavcodec/h264.h
libavcodec/h264_slice.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 17:26:05 +0000 (18:26 +0100)]
Merge commit '
34d4c605e9a5116d5289b35633ade5b01cacab24 '
* commit '
34d4c605e9a5116d5289b35633ade5b01cacab24 ':
h264_loopfilter: constify all uses of H264Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 17:19:54 +0000 (18:19 +0100)]
Merge commit '
7505c8dfba255f8e6c6dbb574d0cec91da16f24d '
* commit '
7505c8dfba255f8e6c6dbb574d0cec91da16f24d ':
h264_cavlc: constify all uses of H264Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 17:19:16 +0000 (18:19 +0100)]
Merge commit '
ba7e165b864d69da4f0c79ec7757cb351535002f '
* commit '
ba7e165b864d69da4f0c79ec7757cb351535002f ':
h264_cabac: constify all uses of H264Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 17:18:37 +0000 (18:18 +0100)]
Merge commit '
5c4b98de4d101ea715ef86847306a510afd0db0c '
* commit '
5c4b98de4d101ea715ef86847306a510afd0db0c ':
h264.c: constify all uses of H264Context in slice and lower-level functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 17:07:01 +0000 (18:07 +0100)]
Merge commit '
e9b2383bf86b38ad18a001801aee20c8182e29bd '
* commit '
e9b2383bf86b38ad18a001801aee20c8182e29bd ':
h264: move mb_mbaff into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 16:30:59 +0000 (17:30 +0100)]
Merge commit '
bc98e8c0e0a8babfea35c98855e366b29cbe1191 '
* commit '
bc98e8c0e0a8babfea35c98855e366b29cbe1191 ':
h264: move mb_field_decoding_flag into the per-slice context
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 16:23:10 +0000 (17:23 +0100)]
Merge commit '
6490a0c0fbe0e55f765ea2aa2e8495181ea1f719 '
* commit '
6490a0c0fbe0e55f765ea2aa2e8495181ea1f719 ':
h264_mb: constify all uses of H264Context
Conflicts:
libavcodec/h264.h
libavcodec/h264_mb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 16:22:12 +0000 (17:22 +0100)]
Merge commit '
51822879e7732ee8175dad98dde1a135f6e5c1a4 '
* commit '
51822879e7732ee8175dad98dde1a135f6e5c1a4 ':
h264_mb: constify block_offset
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 16:21:40 +0000 (17:21 +0100)]
Merge commit '
3bea6409a1868354a1d29b34de424c3636c222b7 '
* commit '
3bea6409a1868354a1d29b34de424c3636c222b7 ':
h264_mvpred: constify all uses of H264Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 16:14:25 +0000 (17:14 +0100)]
Merge commit '
460176aa19acb8d8bdb52af1ec97891e0f65843c '
* commit '
460176aa19acb8d8bdb52af1ec97891e0f65843c ':
h264.h: constify all uses of H264Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 16:13:52 +0000 (17:13 +0100)]
Merge commit '
d27b8248a6ee7e64c68c46c23e00d703b9caa50c '
* commit '
d27b8248a6ee7e64c68c46c23e00d703b9caa50c ':
h264_direct: constify all uses of H264Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 16:13:24 +0000 (17:13 +0100)]
Merge commit '
f42485dbce614b3f63182845da43db690b427b7c '
* commit '
f42485dbce614b3f63182845da43db690b427b7c ':
h264: use a separate GetBitContext for slice data
Conflicts:
libavcodec/h264.c
libavcodec/h264_cavlc.c
libavcodec/h264_parser.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 16:02:23 +0000 (17:02 +0100)]
Merge commit '
2ea00e35e4e0b58f7a306dd55d8f72a21c32c946 '
* commit '
2ea00e35e4e0b58f7a306dd55d8f72a21c32c946 ':
h264: do not abuse the context as a temporary storage in get_last_needed_nal()
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 16:00:51 +0000 (17:00 +0100)]
Merge commit '
404a416d4b1fcbf9db5569481d8181f296c01ea9 '
* commit '
404a416d4b1fcbf9db5569481d8181f296c01ea9 ':
h264: remove some remnants of data partitioning
Conflicts:
libavcodec/h264.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 15:54:48 +0000 (16:54 +0100)]
Merge commit '
7bbc254d646ed9cf6deffc3fda75ae6729f95979 '
* commit '
7bbc254d646ed9cf6deffc3fda75ae6729f95979 ':
h264: move resync_mb_{x,y} into the per-slice context
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 15:25:04 +0000 (16:25 +0100)]
Merge commit '
d4d9068cdf8f4b2b87ae87a2ef880d243f77b977 '
* commit '
d4d9068cdf8f4b2b87ae87a2ef880d243f77b977 ':
h264: move mb_{x,y} into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_cavlc.c
libavcodec/h264_mb.c
libavcodec/h264_slice.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 15:18:29 +0000 (16:18 +0100)]
Merge commit '
0edbe6faa7ef80daf0e84353cbe733389bf1a522 '
* commit '
0edbe6faa7ef80daf0e84353cbe733389bf1a522 ':
h264: move mb_xy into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 15:10:31 +0000 (16:10 +0100)]
Merge commit '
07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa '
* commit '
07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa ':
h264: move is_complex into the per-slice context
Conflicts:
libavcodec/h264_slice.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 15:09:14 +0000 (16:09 +0100)]
Merge commit '
47a0d393504d6726c4a235951153bee0abb3f7d6 '
* commit '
47a0d393504d6726c4a235951153bee0abb3f7d6 ':
h264: move mb_skip_run into the per-slice context
Conflicts:
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 15:07:53 +0000 (16:07 +0100)]
Merge commit '
9951907f6fc37a8d41566dbee09f7c15ff587de6 '
* commit '
9951907f6fc37a8d41566dbee09f7c15ff587de6 ':
h264: move redundant_pic_count into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 15:06:53 +0000 (16:06 +0100)]
Merge commit '
a9b201cacf85d710b102010cb4baef97f00ea39b '
* commit '
a9b201cacf85d710b102010cb4baef97f00ea39b ':
h264: move cabac_init_idc into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 14:59:16 +0000 (15:59 +0100)]
Merge commit '
e6c90ce94f1b07f50cea2babf7471af455cca0ff '
* commit '
e6c90ce94f1b07f50cea2babf7471af455cca0ff ':
h264: move loopfilter parameters into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 14:58:46 +0000 (15:58 +0100)]
Merge commit '
bd3e460b73dd54a68dc253e010c239cefc8d8d55 '
* commit '
bd3e460b73dd54a68dc253e010c239cefc8d8d55 ':
h264: move direct_cache into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 14:58:01 +0000 (15:58 +0100)]
Merge commit '
6479c79f5517e2881bc881e737b2dbce69553878 '
* commit '
6479c79f5517e2881bc881e737b2dbce69553878 ':
h264: move mvd_cache into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 14:57:21 +0000 (15:57 +0100)]
Merge commit '
a67f8ae9a2c8529bf6a635e8ca4e3483592708b1 '
* commit '
a67f8ae9a2c8529bf6a635e8ca4e3483592708b1 ':
h264: move mvd_table into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 14:48:50 +0000 (15:48 +0100)]
Merge commit '
5c8280c3075dd54f26752c3a1185647578421703 '
* commit '
5c8280c3075dd54f26752c3a1185647578421703 ':
h264: move last_qscale_diff into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 14:46:28 +0000 (15:46 +0100)]
Merge commit '
e7226984ac13aacb84eae77a372df8ff7685848f '
* commit '
e7226984ac13aacb84eae77a372df8ff7685848f ':
h264: move [{top,left}_]cbp into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 14:45:44 +0000 (15:45 +0100)]
Merge commit '
30da98adbda6de1f55188f9058a3a5c715049633 '
* commit '
30da98adbda6de1f55188f9058a3a5c715049633 ':
h264: move cabac[_state] into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 14:37:05 +0000 (15:37 +0100)]
avcodec/h264_slice: Merge 2 memcpy()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 14:30:10 +0000 (15:30 +0100)]
Merge commit '
bf03a878a76dea29b36f368759e9f66102b39a5f '
* commit '
bf03a878a76dea29b36f368759e9f66102b39a5f ':
h264: move mb[_{padding,luma_dc}] into the per-slice context
Conflicts:
libavcodec/h264.h
libavcodec/h264_cavlc.c
libavcodec/h264_mb.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 14:25:31 +0000 (15:25 +0100)]
Merge commit '
b063582e0c4f775a8ba377488bd085595e0e7fae '
* commit '
b063582e0c4f775a8ba377488bd085595e0e7fae ':
h264: move intra_pcm_ptr into the per-slice context
Conflicts:
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 13:59:58 +0000 (14:59 +0100)]
Merge commit '
95eb35f30513e335990ad0d5dca6ddc318477291 '
* commit '
95eb35f30513e335990ad0d5dca6ddc318477291 ':
h264: move the ref lists variables into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_direct.c
libavcodec/h264_mb.c
libavcodec/h264_picture.c
libavcodec/h264_refs.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>