aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-252-0/+20
|\ | | | | | | | | | | | | | | | | | | * qatar/master: avfilter: allow setpts filter to use wallclock time for calculations Conflicts: doc/filters.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avfilter: allow setpts filter to use wallclock time for calculationsVladimir Pantelic2013-01-252-0/+16
| | | | | | | | | | Signed-off-by: Vladimir Pantelic <vladoman@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b'Michael Niedermayer2013-01-259-3/+53
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b85a5e87af4254b80913fe33591d96361f30832b': lavu: Add av_strnstr() h264: Allow discarding the cropping information from SPS Conflicts: Changelog doc/APIchanges libavcodec/avcodec.h libavcodec/version.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: Add av_strnstr()Vladimir Pantelic2013-01-255-1/+37
| | | | | | | | | | | | | | This is a length limited version of strstr() Signed-off-by: Vladimir Pantelic <vladoman@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * h264: Allow discarding the cropping information from SPSVittorio Giovara2013-01-254-1/+18
| | | | | | | | | | | | Some 3D systems overload the meaning of the field for other purposes. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '33552a5f7b6ec7057516f487b1a902331f8c353e'Michael Niedermayer2013-01-252-60/+59
|\| | | | | | | | | | | | | | | | | | | | | * commit '33552a5f7b6ec7057516f487b1a902331f8c353e': arm: Add mathops.h to ARCH_HEADERS list avstring: K&R formatting cosmetics Conflicts: libavutil/avstring.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: Add mathops.h to ARCH_HEADERS listDiego Biurrun2013-01-241-0/+2
| | | | | | | | It is an arch-specific header not suitable for standalone compilation.
| * avstring: K&R formatting cosmeticsLuca Barbato2013-01-241-59/+56
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '2c10e2a2f62477efaef5b641974594f7df4ca339'Michael Niedermayer2013-01-252-79/+76
|\| | | | | | | | | | | | | | | | | | | | | * commit '2c10e2a2f62477efaef5b641974594f7df4ca339': build: Make the H.264 parser select h264qpel x86: h264qpel: add cpu flag checks for init function Conflicts: libavcodec/x86/h264_qpel.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Make the H.264 parser select h264qpelDiego Biurrun2013-01-241-1/+1
| | | | | | | | It is required for building the shared H.264 code.
| * x86: h264qpel: add cpu flag checks for init functionJanne Grunau2013-01-241-72/+75
| | | | | | | | | | The code was copied from per cpu extension init function so the checks for supported extensions was overlooked.
* | swscale: check flags instead of nb_components to find if pixel format have alphaPaul B Mahol2013-01-251-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc/gifdec: remove obsolete checkPaul B Mahol2013-01-251-5/+0
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc/gifdec: move idx_line allocation out of gif_read_header1()Paul B Mahol2013-01-251-4/+4
| | | | | | | | | | | | Now allocation is done only if av_image_check_size() passes. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc/gifdec: do not return nonzero *got_frame if frame is not passedPaul B Mahol2013-01-251-8/+6
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc/gifdec: simplify "!= 0" checksPaul B Mahol2013-01-251-3/+3
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc/gifdec: use memcpy()Paul B Mahol2013-01-251-4/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '6bdb841b46d170d58488deaed720729b79223b1d'Michael Niedermayer2013-01-251-3/+3
|\| | | | | | | | | | | | | | | | | | | * commit '6bdb841b46d170d58488deaed720729b79223b1d': arm: h264qpel: use neon h264 qpel functions only if supported * bug was fixed previously (in merge of buggy code): h264: copy h264qpel dsp context to slice thread copies Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: copy h264qpel dsp context to slice thread copiesJanne Grunau2013-01-241-0/+1
| |
| * arm: h264qpel: use neon h264 qpel functions only if supportedJanne Grunau2013-01-241-3/+3
| |
* | vqavideo: check chunk sizes before reading chunksMichael Niedermayer2013-01-251-0/+10
| | | | | | | | | | | | | | Fixes out of array writes Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | eacmv: Free frames on resolution changesMichael Niedermayer2013-01-251-1/+6
| | | | | | | | | | | | | | Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | gifdec: check that w,h is not zeroMichael Niedermayer2013-01-251-0/+2
| | | | | | | | | | | | | | Fixes out of array access Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix compilation with --disable-everything on x86_32.Carl Eugen Hoyos2013-01-251-1/+1
| | | | | | | | Fixes ticket #2183.
* | ffmpeg: fix typo in open_files() messageStefano Sabatini2013-01-251-1/+1
| | | | | | | | Found-By: Justin Ruggles
* | lavf/img2enc: extend current options documentationStefano Sabatini2013-01-252-4/+9
| |
* | lavf/img2dec: fix option help fieldsStefano Sabatini2013-01-251-3/+3
| |
* | doc/faq: fill missing word in the concat protocol entryStefano Sabatini2013-01-251-1/+1
| |
* | doc/faq: mention concat protocol documentation in the protocol concatenation ↵Stefano Sabatini2013-01-251-0/+4
| | | | | | | | entry
* | gifdec: gif_copy_img_rect: Fix end pointerMichael Niedermayer2013-01-241-1/+1
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264_qpel: put cpuflags checks back.Michael Niedermayer2013-01-241-0/+6
| | | | | | | | | | | | These where lost when libav moved the code out of dsputil Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cavsdec: check for value in get_ue_code()Michael Niedermayer2013-01-241-3/+7
| | | | | | | | | | | | | | Fixes integer overflow and prints an error in case the value is invalid. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu/timecode: fix time code calculation for 60000/1001 drop frameJason2013-01-241-7/+10
| | | | | | | | | | Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu/timecode: Allow drop frame mode for 60000/1001 fpsJason2013-01-242-3/+3
| | | | | | | | | | Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: check that fps for tmcd is within encodable range.Michael Niedermayer2013-01-241-0/+5
| | | | | | | | | | | | The fps is stored as a 8 bit value thus 255 is the maximum encodable. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: Calculate fps for tmcd without intermediate step.Michael Niedermayer2013-01-241-1/+1
| | | | | | | | | | | | Fixes part of Ticket2045 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: copy tmcd track timebase parametersMichael Niedermayer2013-01-241-0/+6
| | | | | | | | | | | | Fixes part of Ticket2045 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: include timebase in avcodec string at debug level.Michael Niedermayer2013-01-241-0/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeg12demux: Fallback to startcode for stream type identification.Michael Niedermayer2013-01-241-4/+0
| | | | | | | | | | | | | | | | Fixes Ticket2147 Fixes SageTV support Based-on patch by Andrew Gallatin Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | eacdata: do not set sample_fmtPaul B Mahol2013-01-241-1/+0
| | | | | | | | | | | | | | It is supposed to be set from lavc only. Also this one differs from one set in decoder. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | flic: do not set sample_fmtPaul B Mahol2013-01-241-1/+0
| | | | | | | | | | | | It is supposed to be set from lavc only. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-2429-2488/+2430
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: dsputil: Separate h264 qpel Conflicts: libavcodec/dsputil_template.c libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Separate h264 qpelMans Rullgard2013-01-2427-2459/+2387
| | | | | | | | | | | | | | | | | | | | The sh4 optimizations are removed, because the code is 100% identical to the C code, so it is unlikely to provide any real practical benefit. Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '7a95afe433b2a692f490b98948c082e62ffc1d27'Michael Niedermayer2013-01-241-1/+1
|\| | | | | | | | | | | | | * commit '7a95afe433b2a692f490b98948c082e62ffc1d27': doc: fix dependencies in pod generation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: fix dependencies in pod generationLuca Barbato2013-01-241-1/+1
| | | | | | | | The script can and will change.
* | Merge commit '528878ee7b377e23a194d7c801571d97793047e0'Michael Niedermayer2013-01-241-6/+0
|\| | | | | | | | | | | | | | | | | | | * commit '528878ee7b377e23a194d7c801571d97793047e0': openbsd: configure: Stop enabling PIC by default Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * openbsd: configure: Stop enabling PIC by defaultDiego Biurrun2013-01-241-6/+0
| | | | | | | | | | | | Previously PIC was enabled as a magic workaround for binaries that built fine, but failed to function at all. This problem no longer exists, possibly since the introduction of symbol versioning.
* | Merge commit '4a4a7e138c92901e04db46a6b05cc6948023e5f5'Michael Niedermayer2013-01-242-2/+2
|\| | | | | | | | | | | | | | | * commit '4a4a7e138c92901e04db46a6b05cc6948023e5f5': rtpenc_chain: Use the original AVFormatContext for getting payload type rtp: Make sure the output format pointer is set Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_chain: Use the original AVFormatContext for getting payload typeMartin Storsjö2013-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ff_rtp_get_payload_type, the AVFormatContext is used for checking whether the payload_type or rtpflags options are set. In rtpenc_chain, the rtpctx struct is a newly initialized struct where no options have been set yet, so no options can be fetched from there. All muxers that internally chain rtp muxers have the "rtpflags" field that allows passing such options on (which is how this worked before 8034130e06), so this works just as intended. This makes it possible to produce H263 in RFC2190 format with chained RTP muxers. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtp: Make sure the output format pointer is setMartin Storsjö2013-01-241-1/+1
| | | | | | | | | | | | | | | | Not sure if this actually happens, but we do the same check when checking payload_type further above in the function, so it might be needed. Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 16:23:16 +0000