14aef38a69
Merge commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f'
...
* commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f':
lavu: Add a pixel format for new VDA hwaccel
Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-12 00:37:12 +02:00
66e6c8a7b4
lavu: Add a pixel format for new VDA hwaccel
...
The current hwaccel is broken and cannot be fixed in a compatible
way. It will be deprecated and replaced with a new one.
2014-05-11 14:59:59 +02:00
617e866e25
Move av_find_best_pix_fmt_of_2() from avcodec to avutil
...
This avoids a dependancy of libavfilter on libavcodec
See Ticket 3592
Fixes Ticket2784
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-30 23:14:05 +02:00
0a1cc04e6c
Merge commit '8b17243d1742279bcb2368f8d325ea71e66736c8'
...
* commit '8b17243d1742279bcb2368f8d325ea71e66736c8':
lavu: Add packed YVYU422 pixel format
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-09 03:07:47 +02:00
8b17243d17
lavu: Add packed YVYU422 pixel format
2014-04-07 23:50:34 +02:00
80035db88c
lavu: add missing formats to av_pix_fmt_swap_endianness
2014-04-02 00:27:22 +02:00
6b1ca1709f
Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'
...
* commit '1481d24c3a0abf81e1d7a514547bd5305232be30':
RGBA64 pixel formats
Conflicts:
doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
libswscale/utils.c
See: 9569a3c9f492afb43162michaelni@gmx.at >
2014-03-17 14:41:13 +01:00
1481d24c3a
RGBA64 pixel formats
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2014-03-16 23:05:47 +01:00
a3a4d07d6a
avutil/pixdesc: set bayer pixfmt descriptor flags
...
Signed-off-by: Peter Ross <pross@xvid.org >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-23 02:24:03 +01:00
1c63aed232
Convert XvMC to hwaccel v3
...
Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-22 22:03:47 +01:00
5231eecdaf
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Deprecate obsolete XvMC hardware decoding support
Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12dec.c
libavcodec/mpegvideo.c
libavcodec/options_table.h
libavutil/pixdesc.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-14 03:26:35 +01:00
19e30a58fc
Deprecate obsolete XvMC hardware decoding support
...
XvMC has long ago been superseded by newer acceleration APIs, such as
VDPAU, and few downstreams still support it. Furthermore XvMC is not
implemented within the hwaccel framework, but requires its own specific
code in the MPEG-1/2 decoder, which is a maintenance burden.
2013-11-13 21:07:45 +01:00
a454dec19a
pixdesc: fix NV20* descriptors
...
They were inconsistent (overlapping fields and wrong sizes)
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2013-09-24 14:02:10 +02:00
8310bccc91
avutil/pixdesc: try to fix NV20* descriptors
...
They where inconsistent (overlapping fields and wrong sizes)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-22 11:34:01 +02:00
90ca5a9b5f
Add interleaved 4:2:2 8/10-bit formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-22 10:49:29 +02:00
e208e6d209
lavu: Add interleaved 4:2:2 8/10-bit formats
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2013-09-21 17:36:15 +02:00
f3ba91a3f1
avutil/pixdesc: dont try to use av_read_image_line() with bayer formats
...
It has undefined behavior ATM as its not supported.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-13 20:51:41 +02:00
a25585bb50
avutil/pixdesc: Prevent minor array overread in ff_check_pixfmt_descriptors()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-13 20:51:04 +02:00
9116995efb
libavutil: add AV_PIX_FMT_BAYER pixel formats
...
The pixel format descriptors are set to more or less arbitrary
values as bayer formats do not fit in the descriptors structure.
These values are currently not used for bayer formats and thus
do not matter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-01 17:32:16 +02:00
4ee0984341
Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'
...
* commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909':
vdpau: deprecate old codec-specific pixel formats
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-08-06 13:45:21 +02:00
a0ad5d0113
vdpau: deprecate old codec-specific pixel formats
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2013-08-05 11:16:54 +02:00
20be5e0a0e
Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'
...
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
Disable deprecation warnings for cases where a replacement is available
Conflicts:
libavcodec/avpacket.c
libavcodec/pthread.c
libavcodec/utils.c
libavdevice/v4l2.c
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-08-03 10:08:30 +02:00
7950e519bb
Disable deprecation warnings for cases where a replacement is available
2013-08-02 19:19:02 +02:00
78b4bfdb84
Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents
2013-07-29 23:46:51 +02:00
f36d7831d9
pixdesc: mark gray8 as pseudopal
...
Many functions treat it as such already.
Fixes Bug 499.
CC:libav-stable@libav.org
2013-05-22 21:18:08 +02:00
a90baa63c3
add YUVJ411P
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-21 12:56:11 +02:00
c7c71f95f8
replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-15 11:23:14 +02:00
ff4680922f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
Conflicts:
doc/APIchanges
libavcodec/avpicture.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/tiffenc.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavutil/imgutils.c
libavutil/pixdesc.c
libavutil/version.h
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-15 11:10:09 +02:00
e6c4ac7b5f
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
2013-05-15 07:46:51 +02:00
2efbbc4644
avutil/av_pix_fmt_swap_endianness: simplify and fix code
...
This makes the code also more robust, not having a hard-coded
table that can become (and was) incomplete.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-07 13:13:09 +02:00
60fd88059a
Merge commit '74652af821d7e526a6541876a637fbf81261fa8e'
...
* commit '74652af821d7e526a6541876a637fbf81261fa8e':
pixdesc: add function to return pixel format with swapped endiannes
Conflicts:
libavutil/pixdesc.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-07 10:49:40 +02:00
74652af821
pixdesc: add function to return pixel format with swapped endiannes
2013-05-06 18:51:47 +02:00
e6d4e68755
lavu: add planar 16 bit and 8 bit rgb with alpha
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-05-03 16:58:22 +00:00
2d8a3cf4c1
avutil/pixdesc: check for component overlap
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-16 15:10:13 +02:00
f807d6d200
avutil/pixdesc: check step/depth against each other
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-16 14:36:49 +02:00
20e99a9c10
avutil/pixdesc: support for self-checking the descriptors
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-16 14:27:14 +02:00
1314f534e5
avutil/pixdesc: fix rgb0 descriptors
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-16 14:27:14 +02:00
8e85b69d71
Merge commit '8c65264595d5a82c56ae5043320e4b875a414229'
...
* commit '8c65264595d5a82c56ae5043320e4b875a414229':
pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values
img2: Add j2k file extension for JPEG 2000
Conflicts:
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-05 12:39:06 +02:00
8c65264595
pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2013-04-04 19:50:59 +02:00
17ebef2fc8
Merge commit '2c328a907978b61949fd20f7c991803174337855'
...
* commit '2c328a907978b61949fd20f7c991803174337855':
pixdesc: add a function for counting planes in a pixel format.
avplay: remove the -debug option.
Revert "asfenc: return error on negative timestamp"
Conflicts:
doc/APIchanges
doc/ffplay.texi
ffplay.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-20 11:24:11 +01:00
2c328a9079
pixdesc: add a function for counting planes in a pixel format.
2013-03-19 11:12:17 +01:00
dae382b5b2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU.
pixfmt: add picture format for VDPAU
Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-12 13:42:42 +01:00
169fb94f0f
pixfmt: add picture format for VDPAU
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2013-01-12 12:00:49 +01:00
9ad6b13020
lavu/pixdesc: fix a const qualifier discarding warning.
2012-12-16 20:41:28 +01:00
7fb49639e6
lavu: make sure av_pix_fmt_desc_next returns a valid pix fmt.
...
This is required because there are some "holes" in the list for
compatibility with the fork.
The commit also removes the now unecessary check from cmdutils.
Found-by: wm4
2012-12-16 20:39:39 +01:00
b519298a15
pixdesc: fix yuva 10bit bit depth
...
It was wrongly set as the yuva 16bit one.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2012-12-05 17:52:55 +01:00
45326cb684
pixdesc: fix broken yuva definitions
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2012-12-05 01:04:45 +00:00
1dafbdac65
pixdesc: fix alpha flags
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-11-21 20:07:34 +01:00
649d8bd8a5
pixdesc: add av_get_padded_bits_per_pixel()
...
This will be needed to allow removing the PixFmtInfo table
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-11-21 17:05:50 +01:00
494945cb66
Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480'
...
* commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480':
avcodec: split avpicture from imgconvert
pixdesc: add PIX_FMT_ALPHA flag
Conflicts:
libavcodec/imgconvert.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-11-21 15:37:01 +01:00
Michael Niedermayer