summaryrefslogtreecommitdiffstats
path: root/libavcodec/imgconvert.c
Commit message (Collapse)AuthorAgeFilesLines
* imgconvert: fix 2 "discards const qualifier from pointer target type"Michael Niedermayer2012-12-261-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* imgconvert: dont depend on default return type for get_color_type()Michael Niedermayer2012-12-261-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* replace av_log(0, by av_log(NULL,Michael Niedermayer2012-11-231-3/+3
| | | | | | The first parameter is a pointer and NULL is more correct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* imgconvert-test: count the number of unused pixel format values.Michael Niedermayer2012-11-211-1/+8
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* imgconvert-test: skip pix formats without nameMichael Niedermayer2012-11-211-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* imgconvert-test: test alpha flagsMichael Niedermayer2012-11-211-1/+7
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* imgconvert: remove avg_bits_per_pixel(), its redundantMichael Niedermayer2012-11-211-10/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e'Michael Niedermayer2012-11-211-375/+15
|\ | | | | | | | | | | | | | | | | | | * commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e': imgconvert: remove PixFmtInfo Conflicts: libavcodec/imgconvert.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * imgconvert: remove PixFmtInfoLuca Barbato2012-11-201-461/+35
| | | | | | | | It is pleonastic and was used in stale functions pending replacement.
* | imgconvert: fix color type for non normal pix_fmts like HW stuff and unused ↵Michael Niedermayer2012-11-211-1/+2
| | | | | | | | | | | | entries. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec_get_pix_fmt_loss: remove PixFmtInfo useMichael Niedermayer2012-11-211-17/+34
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | imgconvert: print color type tooMichael Niedermayer2012-11-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | imgconvert: remove PixFmtInfo use from avg_bits_per_pixel()Michael Niedermayer2012-11-211-3/+1
| | | | | | | | | | | | | | This fixes several inconsistencies with YUV >8bit formats caused due to missing information in the PixFmtInfo table. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec_find_best_pix_fmt_of_2: favor formats with fewer components if it ↵Michael Niedermayer2012-11-211-1/+7
| | | | | | | | | | | | does not incur a loss. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | imgconvert-test: add avg bits per pixelMichael Niedermayer2012-11-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | is_yuv_planar: remove use of PixFmtInfoMichael Niedermayer2012-11-211-3/+2
| | | | | | | | | | | | This fixes the behavior for a few yuva 16bit formats Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | imgconvert: add self test codeMichael Niedermayer2012-11-211-0/+15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480'Michael Niedermayer2012-11-211-46/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480': avcodec: split avpicture from imgconvert pixdesc: add PIX_FMT_ALPHA flag Conflicts: libavcodec/imgconvert.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: split avpicture from imgconvertLuca Barbato2012-11-201-85/+0
| | | | | | | | All the non deprecated functions are in avpicture.c now.
* | Remove deprecation of avcodec_get_chroma_sub_sample.Michael Niedermayer2012-11-141-0/+2
| | | | | | | | | | | | | | Add explanations what the difference between the 2 functions are and when either should be used. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'Michael Niedermayer2012-11-141-6/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2': x86: h264_weight_10bit: port to cpuflags libtheoraenc: add missing pixdesc.h header avcodec: remove ff_is_hwaccel_pix_fmt pixdesc: add av_pix_fmt_get_chroma_sub_sample hlsenc: stand alone hls segmenter Conflicts: doc/muxers.texi libavcodec/ffv1enc.c libavcodec/imgconvert.c libavcodec/mpegvideo_enc.c libavcodec/tiffenc.c libavformat/Makefile libavformat/allformats.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: remove ff_is_hwaccel_pix_fmtLuca Barbato2012-11-131-6/+0
| | | | | | | | | | It is used only in one place and is unlikely it would be needed elsewhere.
* | pix_fmt_info: add 9/10 bit YUVA formatsMichael Niedermayer2012-10-311-0/+36
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: const correctness for avpicture_fill()Paul B Mahol2012-10-301-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec_find_best_pix_fmt_of_2: fix handling or PIX_FMT_NONEMichael Niedermayer2012-10-141-1/+1
| | | | | | | | | | Fixes CID733775 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '50ba57e0ce63d9904269ea0728936a0c79f8bfb5'Michael Niedermayer2012-10-121-15/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '50ba57e0ce63d9904269ea0728936a0c79f8bfb5': lavc: do not use av_pix_fmt_descriptors directly. Conflicts: libavcodec/imgconvert.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/mpegvideo.c libavcodec/rawdec.c libavcodec/rawenc.c libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: do not use av_pix_fmt_descriptors directly.Anton Khirnov2012-10-121-12/+18
| |
* | Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-081-148/+148
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov2012-10-081-116/+116
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-281-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dwt: Drop unused functions spatial_compose{53|97}i() nutdec: Remove unused and broken debug function stub avcodec: Drop long-deprecated imgconvert.h header Add Opus support to the Ogg muxer. Add Opus codec id and codec description. avformat: Identify anonymous AVIO typedef structs. Conflicts: libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/imgconvert.h libavcodec/version.h libavformat/oggenc.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Drop long-deprecated imgconvert.h headerDiego Biurrun2012-09-271-1/+0
| |
* | imgconvert: silence some const incompatible pointer warnings.Michael Niedermayer2012-09-051-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: support building with the forks ABI for avcodec_find_best_pix_fmt2()Michael Niedermayer2012-08-311-0/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | imgconvert: add avcodec_find_best_pix_fmt_of_2()Michael Niedermayer2012-08-311-3/+9
| | | | | | | | | | | | and deprecate avcodec_find_best_pix_fmt2() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-311-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: MSS1 and MSS2: set final pixel format after common stuff has been initialised MSS2 decoder configure: handle --disable-asm before check_deps x86: Split inline and external assembly #ifdefs configure: x86: Separate inline from standalone assembler capabilities pktdumper: Use a custom define instead of PATH_MAX for buffers pktdumper: Use av_strlcpy instead of strncpy pktdumper: Use sizeof(variable) instead of the direct buffer length Conflicts: Changelog configure libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/dct-test.c libavcodec/imgconvert.c libavcodec/mss12.c libavcodec/version.h libavfilter/x86/gradfun.c libswscale/x86/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: Split inline and external assembly #ifdefsDiego Biurrun2012-08-311-4/+4
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-161-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Don't include common.h from avutil.hMartin Storsjö2012-08-151-0/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | imgconvert: Implement avcodec_find_best_pix_fmt_of_list()Michael Niedermayer2012-07-251-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | The old avcodec_find_best_pix_fmt() was insufficient due to 64 pix_fmt limit. In ffmpeg this problem has been solved long ago through avcodec_find_best_pix_fmt2() Today libav has added a incompatible modified version of avcodec_find_best_pix_fmt2() under the same name, thus again breaking ABI/API ... The avcodec_find_best_pix_fmt_of_list() added in this commit here makes the libav API available to ffmpeg users too. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | imgconvert: favor pixel formats without resolution lossMichael Niedermayer2012-07-181-0/+1
| | | | | | | | | | | | Fixes Ticket1517 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-151-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: eval: add gt(), gte(), lt() and lte() fate tests eval: fix swapping of lt() and lte() imgconvert: deprecate avcodec_find_best_pix_fmt() imgconvert: add avcodec_find_best_pix_fmt2() imgconvert: avoid undefined left shift in avcodec_find_best_pix_fmt Conflicts: libavcodec/imgconvert.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * imgconvert: deprecate avcodec_find_best_pix_fmt()Janne Grunau2012-07-131-0/+2
| |
| * imgconvert: add avcodec_find_best_pix_fmt2()Janne Grunau2012-07-131-12/+36
| | | | | | | | | | | | | | The number of pixel formats outgrew the number of available bits in the bitmask used in avcodec_find_best_pix_fmt(). avcodec_find_best_pix_fmt2() uses a PIX_FMT_NONE terminated list of pixel formats instead.
| * imgconvert: avoid undefined left shift in avcodec_find_best_pix_fmtJanne Grunau2012-07-131-1/+2
| | | | | | | | CC: libav-stable@libav.org
* | imgconvert: add planar RGB formats to pix_fmt_infoMichael Niedermayer2012-07-031-0/+34
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | imgconvert: add yuv 9,10,12,14 bit planar YUV formats to pix_fmt_infoMichael Niedermayer2012-07-031-0/+72
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu/imgutils: create misc functions for dealing with buffersStefano Sabatini2012-06-261-47/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Move the lavc/imgconvert functions and rename them as follows: avpicture_get_size -> av_image_get_buffer_size() avpicture_fill -> av_image_fill_arrays() avpicture_layout -> av_image_copy_to_buffer() The new functions have an align parameter, which allows to define the linesize alignment assumed in the buffer (which is set or read). The names of the functions are consistent with the lavu/samples API (av_samples_get_buffer_size(), av_samples_fill_arrays()).
* | lavc/imgconvert: fix check on av_image_check_size() return code in ↵Stefano Sabatini2012-06-191-2/+2
| | | | | | | | | | | | | | | | | | avpicture_get_size() The documentation states that av_image_check_size() will return a negative value in case of error, while the check is done on ret != 0. Also return a proper error code rather than -1 in case the check fails.
* | lavc/imgconvert: remove pointless switch block from avpicture_fill()Stefano Sabatini2012-06-191-10/+0
| |
* | Add yuva422p pix_fmt.Carl Eugen Hoyos2012-05-081-0/+4
| |
OpenPOWER on IntegriCloud