summaryrefslogtreecommitdiffstats
path: root/libavcodec/dvdata.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer2013-01-231-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f': Drop DCTELEM typedef Conflicts: libavcodec/alpha/dsputil_alpha.h libavcodec/alpha/motion_est_alpha.c libavcodec/arm/dsputil_init_armv6.c libavcodec/bfin/dsputil_bfin.h libavcodec/bfin/pixels_bfin.S libavcodec/cavs.c libavcodec/cavsdec.c libavcodec/dct-test.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/eamad.c libavcodec/h264_cavlc.c libavcodec/h264idct_template.c libavcodec/mpeg12.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/ppc/dsputil_altivec.c libavcodec/proresdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Drop DCTELEM typedefDiego Biurrun2013-01-221-3/+3
| | | | | | | | | | | | It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-081-51/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: Support 'rtmp_live', an option which specifies if the media is a live stream. av_samples_fill_array: Mark unmodified function argument as const. lagarith: add YUY2 decoding support Support decoding unaligned rgb24 lagarith. dv: Split profile handling code into a separate file. flvenc: use AVFormatContext, not AVCodecContext for logging. mov: Remove write-only variable in mov_read_chan(). fate: Change the probe-format refs to match the final text format committed. fate: Add avprobe as a make dependency Add probe fate tests to test for regressions in detecting media types. fate: Add oneline comparison method qdm2: clip array indices returned by qdm2_get_vlc(). avplay: properly close/reopen AVAudioResampleContext on channel layout change avcodec: do not needlessly set packet size to 0 in avcodec_encode_audio2() avcodec: for audio encoding, reset output packet when it is not valid avcodec: refactor avcodec_encode_audio2() to merge common branches avcodec: remove fallbacks for AVCodec.encode() in avcodec_encode_audio2() Conflicts: ffplay.c libavcodec/Makefile libavcodec/dvdata.c libavcodec/dvdata.h libavcodec/qdm2.c libavcodec/utils.c libavformat/flvenc.c libavformat/mov.c tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: Split profile handling code into a separate file.Diego Biurrun2012-05-071-45/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-171-0/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: indeo3: add parens around some macro arguments h264: use proper PROLOGUE statement for a function using 8 registers. doc: Update sample Vim config with suitable (function) indentation settings. dv: Merge dvquant.h into dvdata.c where all other DV tables reside. dv: Move static tables only used in one place to where they are used. graphparser: set next to NULL on an entry extracted from inputs list doc/filters: update documentation. avconv: flush decoders immediately after an EOF. avconv: send EOF to vsrc_buffer. avconv: reindent. Conflicts: doc/filters.texi ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: Merge dvquant.h into dvdata.c where all other DV tables reside.Diego Biurrun2012-04-161-0/+10
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-291-0/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: asf: only set index_read if the index contained entries. cabac: add overread protection to BRANCHLESS_GET_CABAC(). cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC(). cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE(). cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC(). h264: add overread protection to get_cabac_bypass_sign_x86(). h264: reindent get_cabac_bypass_sign_x86(). h264: use struct offsets in get_cabac_bypass_sign_x86(). h264: fix overreads in cabac reader. wmall: fix seeking. lagarith: fix buffer overreads. dvdec: drop unnecessary dv_tablegen.h #include build: fix doc generation errors in parallel builds Replace memset(0) by zero initializations. faandct: Remove FAAN_POSTSCALE define and related code. dvenc: print allowed profiles if the video doesn't conform to any of them. avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size. FATE: add a test for vp8 with changing frame size. fate: add kgv1 fate test. oggdec: calculate correct timestamps in Ogg/FLAC Conflicts: libavcodec/4xm.c libavcodec/cook.c libavcodec/dvdata.c libavcodec/dvdsubdec.c libavcodec/lagarith.c libavcodec/lagarithrac.c libavcodec/utils.c tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dvenc: print allowed profiles if the video doesn't conform to any of them.Anton Khirnov2012-03-281-0/+5
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-281-0/+44
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: westwood_vqa: fix SND0 chunk handling westwood_vqa: set video stream duration raw: forward avpicture_fill() error code in raw_decode(). build: Do not explicitly add the doc directory to the OBJDIRS list. dv: Split off DV video decoder into its own file. build: fix RALF decoder standalone compilation, which depends on Golomb code configure: Drop stray duplicate entry for --disable-fft from help output. Conflicts: libavcodec/dv.c libavcodec/rawdec.c libavformat/westwood_vqa.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: Split off DV video decoder into its own file.Diego Biurrun2012-03-271-0/+44
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-111-203/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (38 commits) v210enc: remove redundant check for pix_fmt wavpack: allow user to disable CRC checking v210enc: Use Bytestream2 functions cafdec: Check return value of avio_seek and avoid modifying state if it fails yop: Check return value of avio_seek and avoid modifying state if it fails tta: Check return value of avio_seek and avoid modifying state if it fails tmv: Check return value of avio_seek and avoid modifying state if it fails r3d: Check return value of avio_seek and avoid modifying state if it fails nsvdec: Check return value of avio_seek and avoid modifying state if it fails mpc8: Check return value of avio_seek and avoid modifying state if it fails jvdec: Check return value of avio_seek and avoid modifying state if it fails filmstripdec: Check return value of avio_seek and avoid modifying state if it fails ffmdec: Check return value of avio_seek and avoid modifying state if it fails dv: Check return value of avio_seek and avoid modifying state if it fails bink: Check return value of avio_seek and avoid modifying state if it fails Check AVCodec.pix_fmts in avcodec_open2() svq3: Prevent illegal reads while parsing extradata. remove ParseContext1 vc1: use ff_parse_close mpegvideo parser: move specific fields into private context ... Conflicts: libavcodec/4xm.c libavcodec/aacdec.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/mpeg4video_parser.c libavcodec/svq3.c libavcodec/v210enc.c libavformat/cafdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: Move tables from dvdata.h to dvdata.cAlex Converse2012-02-091-39/+0
| |
| * dv: Move a table used only by the demuxer out of a shared header.Alex Converse2012-02-091-4/+0
| |
| * dv: Move functions used only by the encoder out of a shared header.Alex Converse2012-02-091-35/+0
| |
| * dv: Split dvdata.h into dvdata.h and dvquant.hAlex Converse2012-02-091-125/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-211-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (47 commits) lavc: hide private symbols. lavc: deprecate img_get_alpha_info(). lavc: use avpriv_ prefix for ff_toupper4. lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits. lavc: use avpriv_ prefix for ff_ac3_parse_header. lavc: use avpriv_ prefix for ff_frame_rate_tab. lavc: rename ff_find_start_code to avpriv_mpv_find_start_code lavc: use avpriv_ prefix for ff_split_xiph_headers. lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header. lavc: use avpriv_ prefix for some dv symbols used in lavf. lavc: use avpriv_ prefix for some flac symbols used in lavf. lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf. lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf. lavc: use avpriv_ prefix for ff_aac_parse_header(). lavf: hide private symbols. lavf: use avpriv_ prefix for some dv functions. lavf: use avpriv_ prefix for ff_new_chapter(). avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2() avcodec: clarify documentation of CODEC_CAP_DELAY ... Conflicts: configure doc/general.texi libavcodec/Makefile libavcodec/aacdec.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/dv.c libavcodec/dvdata.c libavcodec/dvdata.h libavcodec/libspeexenc.c libavcodec/mpegvideo.c libavcodec/version.h libavformat/avidec.c libavformat/dv.c libavformat/dv.h libavformat/flvenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/oggparsespeex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use avpriv_ prefix for some dv symbols used in lavf.Anton Khirnov2011-10-201-3/+3
| | | | | | | | Specifically, ff_dv_frame_profile and ff_dv_codec_profile.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | dvdec: Fix dvsd profile[1] detection.Michael Niedermayer2011-09-021-0/+2
|/ | | | | | | Fixes Ticket159 If someone knows of a cleaner way to detect this, patch is welcome. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split VLC-related tables out of dvdata.h to make it easier to add supportReimar Döffinger2010-03-211-227/+0
| | | | | | for hard-coding tables. Originally committed as revision 22620 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split parts of dvdata.h into dvdata.c, this ensures that things likeReimar Döffinger2009-10-161-255/+3
| | | | | | | | work_chunks_* and dv_idct_factor_* variables appear only once in the binary instead of 3 times. Saves 3264 bytes in .rodata and 312416 bytes in .bss on x86_64. Originally committed as revision 20246 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Allow decoding of 625/50 (PAL) with video_stype==1.Maksym Veremeyenko2009-09-241-0/+20
| | | | | | Patch by Maksym Veremeyenko, verem m1stereo tv Originally committed as revision 20018 to svn://svn.ffmpeg.org/ffmpeg/trunk
* check if frame size matches old sys and assumes corrupted input, fixes #1192Baptiste Coudurier2009-06-141-1/+7
| | | | Originally committed as revision 19192 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full internal pathname in doxygen @file directives.Diego Biurrun2009-02-011-1/+1
| | | | | | | Otherwise doxygen complains about ambiguous filenames when files exist under the same name in different subdirectories. Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix decoding 720p50 audio samplesBaptiste Coudurier2009-01-311-3/+3
| | | | Originally committed as revision 16906 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-191-1/+1
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Making idct factor tables dynamically allocatedRoman Shaposhnik2008-11-201-0/+14
| | | | Originally committed as revision 15885 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Getting rid of huge static DV tablesRoman Shaposhnik2008-11-181-5715/+0
| | | | Originally committed as revision 15874 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Taking advantage of the new ->execute APIRoman Shaposhnik2008-11-121-10/+15
| | | | Originally committed as revision 15806 to svn://svn.ffmpeg.org/ffmpeg/trunk
* implementing more efficient (and direct) allocation of work for DV codec workersRoman Shaposhnik2008-11-081-0/+20
| | | | Originally committed as revision 15788 to svn://svn.ffmpeg.org/ffmpeg/trunk
* prettyprinting cosmeticsDiego Biurrun2008-10-241-72/+75
| | | | Originally committed as revision 15682 to svn://svn.ffmpeg.org/ffmpeg/trunk
* spelling cosmeticsDiego Biurrun2008-10-241-1/+1
| | | | Originally committed as revision 15681 to svn://svn.ffmpeg.org/ffmpeg/trunk
* uses FF_ARRAY_ELEMS() where appropriateAurelien Jacobs2008-10-211-2/+2
| | | | Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
* replacing frame_rate and frame_rate_base with an AVRational time_baseRoman Shaposhnik2008-10-071-20/+10
| | | | Originally committed as revision 15584 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetic updates as per Michael's suggestionRoman Shaposhnik2008-10-071-2/+2
| | | | Originally committed as revision 15582 to svn://svn.ffmpeg.org/ffmpeg/trunk
* vertically aligning as per Michael's suggestionRoman Shaposhnik2008-10-071-36/+36
| | | | Originally committed as revision 15581 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Doxygenizing the commentsRoman Shaposhnik2008-10-071-3/+9
| | | | Originally committed as revision 15578 to svn://svn.ffmpeg.org/ffmpeg/trunk
* spelling cosmeticsDiego Biurrun2008-10-021-13/+13
| | | | Originally committed as revision 15518 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Globally rename the header inclusion guard names.Stefano Sabatini2008-08-311-3/+3
| | | | | | | | | Consistently apply this rule: the guard name is obtained from the filename by stripping the leading "lib", converting '/' and '.' to '_' and uppercasing the resulting name. Guard names in the root directory have to be prefixed by "FFMPEG_". Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Intial implementation of the DV100 (AKA DVCPRO HD) decoder and demuxer asRoman Shaposhnik2008-08-281-7/+3715
| | | | | | specified in SMPTE 370M Originally committed as revision 15010 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Introducing video_stype for holding the value of VAUX source packRoman Shaposhnik2008-08-281-16/+22
| | | | | | and simplifying dv_frame_profile Originally committed as revision 15007 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Making block size in bits variable and dependent on the DV specRoman Shaposhnik2008-08-191-0/+15
| | | | Originally committed as revision 14842 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Making the number of blocks per macroblock dependent on the DV streamRoman Shaposhnik2008-08-191-1/+6
| | | | | | specification Originally committed as revision 14841 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Introducing DV_MAX_BPM macro instead of a hardcoded value for theRoman Shaposhnik2008-08-191-0/+3
| | | | | | highest number of blocks per macroblock Originally committed as revision 14840 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fixing the units in DV50 tables (both coordinates areRoman Shaposhnik2008-08-111-1190/+1188
| | | | | | | supposed to be in units of 8 pixels) and simplifying the calculations of y_ptr and c_offset. Originally committed as revision 14693 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Coalescing the un-weighting and de-quantization steps for fasterRoman Shaposhnik2008-08-111-22/+1
| | | | | | processing Originally committed as revision 14691 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full path for #includes from another directory.Diego Biurrun2008-05-091-1/+1
| | | | Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
* some constMichael Niedermayer2008-02-011-1/+1
| | | | Originally committed as revision 11758 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix random typos.Diego Biurrun2008-01-081-1/+1
| | | | Originally committed as revision 11477 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud