summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* doc/ffmpeg: correct minor typoGanesh Ajjanagadde2015-08-11
| | | | | Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavcodec/qsvdec.c: Extended error messages for MFXVideoDECODE_Init() resultIvan Uskov2015-08-11
| | | | | Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* mmaldec: fix problems with flush logicwm42015-08-11
| | | | | | | | | | | | Don't try to do a blocking wait for MMAL output if we haven't even sent a single real packet, but only flush packets. Obviously we can't expect to get anything back. Additionally, don't send a flush packet to MMAL in the same case. It appears the MMAL decoder will sometimes hang in mmal_vc_port_disable() (called from ffmmal_close_decoder()), waiting for a reply from the GPU which never arrives. Either MMAL disallows sending flush packets without preceding real data, or it's a MMAL bug.
* mmaldec: do not mutate user's AVCodecContext extradata fieldwm42015-08-11
|
* mmaldec: hack against buffering problems on broken inputwm42015-08-11
| | | | | | | | | | | | | | | | I can't come up with a nice way to handle this. It's hard to keep the lock-stepped input/output in this case. You can't predict whether the MMAL decoder will output a picture (because it's asynchronous), so you have to assume in general that any packet could produce 0 or 1 frames. You can't continue to write input packets to the decoder, because then you might get too many output frames, which you can't get rid of because the lavc decoding API does not allow the decoder to return an output frame without consuming an input frame (except when flushing). The ideal fix is a M:N decoding API (preferably asynchronous), which would make this code potentially much cleaner. For now, this hack will do.
* concatdec: fix broken file_inpoint calculationMarton Balint2015-08-11
| | | | | | Should fix ticket #4765. Signed-off-by: Marton Balint <cus@passwd.hu>
* aacenc: Move small misc. functions to a separate fileRostislav Pehlivanov2015-08-11
| | | | | | | | | | | As well as tables littered everywhere, functions were spread out all across the encoder's files. This moves them to a single place where they can be used by either the encoder's main files or additional encoder files. Additionally, it changes the type of some to 'inline' to enable us to simply put them in a header file and possibly gain some speed due to compiler optimizations. Signed-off-by: Claudio Freire <klaussfreire@gmail.com>
* doc/codecs: Document color_range for the input sideMichael Niedermayer2015-08-11
| | | | | | Partly fixes Ticket 443 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/ftp: Use av_freep() for dir_bufferMichael Niedermayer2015-08-10
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/ftp: properly read an empty pathMariusz Szczepańczyk2015-08-10
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/ftp: implement directory listing callbacksLukasz Marek2015-08-10
| | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mjpegenc_common: do not ignore the color_range fieldMichael Niedermayer2015-08-10
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vsrc_testsrc: smpte(hd)bars: fix uninitialized last rows and ↵Paul B Mahol2015-08-10
| | | | | | columns of chroma planes For cases width and/or height is not multiple of chroma subsamplings.
* Merge commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc'Hendrik Leppkes2015-08-10
|\ | | | | | | | | | | | | * commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc': movenc: Place the sidx index after the initial moov/mdat pair Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * movenc: Place the sidx index after the initial moov/mdat pairMartin Storsjö2015-08-10
| | | | | | | | | | | | | | | | | | | | For fragmented files with non-empty moov, with a fragment index (sidx), place the index after the initial moov/mdat pair. Previously, for this pathological case, the index was written at the start of the file. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '83f254e65f938657a4dbec711e4c94252a72daf9'Hendrik Leppkes2015-08-10
|\| | | | | | | | | | | | | | | | | | | | | * commit '83f254e65f938657a4dbec711e4c94252a72daf9': movenc: Rename reserved_moov_pos to reserved_header_pos Conflicts: libavformat/movenc.c libavformat/movenc.h Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * movenc: Rename reserved_moov_pos to reserved_header_posMartin Storsjö2015-08-10
| | | | | | | | | | | | | | The same field is also used for writing the sidx index header, for fragmented files, when the faststart flag is used. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8e34089e265a6b01e1e3301e8864439d26793753'Hendrik Leppkes2015-08-10
|\| | | | | | | | | | | | | * commit '8e34089e265a6b01e1e3301e8864439d26793753': movenc: Check that frag_info entries exist in mov_write_sidx_tag Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * movenc: Check that frag_info entries exist in mov_write_sidx_tagMartin Storsjö2015-08-10
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes crashes with pathological cases when trying to write a sidx index (via the -movflags faststart option, in combination with fragmenting options), when no fragments actually have been written. (This is possible if the empty_moov flag isn't used, so that all actual packet data is written in the moov/mdat pair, and no moof/mdat pairs have been written.) In these pathological cases, no sidx should be written at all. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2'Hendrik Leppkes2015-08-10
|\| | | | | | | | | | | | | | | | | | | * commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2': cosmetics: Drop spurious spaces from if clauses Conflicts: libavcodec/vc1_block.c Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * cosmetics: Drop spurious spaces from if clausesPaolo Bizzarri2015-08-08
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '0f562f5b833d603e04123d198c59f8b2b5eb43e4'Hendrik Leppkes2015-08-10
|\| | | | | | | | | | | | | | | | | | | * commit '0f562f5b833d603e04123d198c59f8b2b5eb43e4': h264: Do not print an error when the buffer has to be refilled Conflicts: libavcodec/h264.c Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * h264: Do not print an error when the buffer has to be refilledLuca Barbato2015-08-06
| | | | | | | | Partially amends 9469370fb32679352e66826daf77bdd2e6f067b5
* | avformat/gifdec: correct r_frame_rate for single frame gifsMichael Niedermayer2015-08-10
| | | | | | | | | | | | Fixes Ticket4650 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | postproc: Deprecate QP_STORE_T, it lacks a PP/AV/FF prefixMichael Niedermayer2015-08-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Revert "movtextdec: Use default style information from movtext header"Michael Niedermayer2015-08-10
| | | | | | | | | | | | | | | | The commit broke sub-movtext and sub-subripenc fate output differs between mips ad x86 so updating fate ref is not possible This reverts commit d670848d4c2757068ff43a68c05d01b28c809fb4.
* | movtextdec: Use default style information from movtext headerNiklesh2015-08-09
| | | | | | | | Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
* | ffplay: increase MIN_FRAMES to 25Marton Balint2015-08-09
| | | | | | | | | | | | | | | | | | | | | | FFplay was using a 5 frame packet buffer, this is not much (e.g. 200 ms for 25fps video), when HLS is requesting a new segment via HTTP, it may take longer for the request to complete. Should fix ticket #4720. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: add specific constants for buffer fullness settings when using ↵Marton Balint2015-08-09
| | | | | | | | | | | | external clock Signed-off-by: Marton Balint <cus@passwd.hu>
* | avcodec: loongson optimize h264qpel with mmi v1周晓勇2015-08-09
| | | | | | | | | | Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale/alphablend: Support chroma subsamplingMichael Niedermayer2015-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale/alphablend: Support SWS_ALPHA_BLEND_CHECKERBOARDMichael Niedermayer2015-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale/alphablend: Factor target computation out of the loopsMichael Niedermayer2015-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale/alphablend: Fix big endian formats on LEMichael Niedermayer2015-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale/alphablend: support packed pixel formatsMichael Niedermayer2015-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/snowenc: Avoid use of deprecated me_methodMichael Niedermayer2015-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale/swscale: Document param[0..1]Michael Niedermayer2015-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | graphdump: include internal.h for AVFilterPadAndreas Cadhalpun2015-08-08
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | use avfilter_pad_get_{type,name} accessor functionsAndreas Cadhalpun2015-08-08
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avfilter: remove obsolete function declarationsAndreas Cadhalpun2015-08-08
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avcodec: add missing FF_API_CODEC_ID guardAndreas Cadhalpun2015-08-08
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | cmdutils: remove sws_opts usage, simplify codeMichael Niedermayer2015-08-08
| | | | | | | | | | | | It has become unused as all code was switched to AVDictionary Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | cmdutils: Fix overriding flags on the command line.Michael Niedermayer2015-08-08
| | | | | | | | | | | | | | Previously the code just appended the strings of flags which worked with "+bitexact" but would not work with something like "0" Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: switch swscale option handling to AVDictionary similar to what the ↵Michael Niedermayer2015-08-08
| | | | | | | | | | | | other subsystems use Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/vf_scale: apply generic options after flags.Michael Niedermayer2015-08-08
| | | | | | | | | | | | Otherwise the flags overwrite anything set by the generic stuff to the flags Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffplay: pass all sws options to the filter graphMichael Niedermayer2015-08-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | cmdutils: Export all sws options using a AVDictionary like the other ↵Michael Niedermayer2015-08-08
| | | | | | | | | | | | | | | | subsystems do This makes extracting options other than sws_flags easier Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/graphparser: Do not ignore scale_sws_opts if args == NULLMichael Niedermayer2015-08-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale: Implement alphablendaway for planar 4:4:4 formatsMichael Niedermayer2015-08-08
| | | | | | | | | | | | Fixes Ticket4746 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale: Add sws_alloc_set_opts()Michael Niedermayer2015-08-08
| | | | | | | | | | | | | | This simplifies allocating and initializing swscale contexts with custom options. The function is internal currently but could be moved into the public header Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>