Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-03-30img2dec: remove GLOB_TILDE support.Michael Niedermayer
tilde expansion should/can be done by the shell Reviewed-by: Alexander Strasser <eclipse7@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-30img2dec: Recognize glob meta chars only if prefixed by %Alexander Strasser
This changes globbing support to only be used if the character contains at least one glob meta character that is preceded by an unescaped %. To escape a literal % one would use %% which is identical to the way to match a % with image2 sequence generation feature. * Makes it possible to have patterns like %04d-[720p].jpg work again with sequence number generation. Previously this would always be detected as a glob pattern and was interpreted by the image2 glob code instead. * Makes it possible to use %*-[720p].jpg to match above pattern without having to double escape it to be not interpreted by most shells and not by the image2 glob code (previously one would need to use \*-\\\[720p\\\].jpg to achieve the same) Signed-off-by: Alexander Strasser <eclipse7@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-30img2: glob matching for image seriesBrian Olson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-23Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: dxva2: don't check for DXVA_PictureParameters->wDecodedPictureIndex img2: split muxer and demuxer into separate files rm: prevent infinite loops for index parsing. aac: fix infinite loop on end-of-frame with sequence of 1-bits. mov: Add more HDV and XDCAM FourCCs. lavf: don't set AVCodecContext.has_b_frames in compute_pkt_fields(). rmdec: when using INT4 deinterleaving, error out if sub_packet_h <= 1. cdxl: correctly synchronize video timestamps to audio mlpdec_parser: fix a few channel layouts. Add channel names to channel_names[] array for channels added in b2890f5 movenc: Buffer the mdat for the initial moov fragment, too flvdec: Ignore the index if the ignidx flag is set flvdec: Fix indentation movdec: Don't parse all fragments if ignidx is set movdec: Restart parsing root-level atoms at the right spot prores: use natural integer type for the codebook index mov: Add support for MPEG2 HDV 720p24 (hdv4) swscale: K&R formatting cosmetics (part I) swscale: variable declaration and placement cosmetics Conflicts: configure libavcodec/aacdec.c libavcodec/mlp_parser.c libavformat/flvdec.c libavformat/img2.c libavformat/isom.h libavformat/mov.c libavformat/movenc.c libswscale/rgb2rgb.c libswscale/rgb2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-23img2: split muxer and demuxer into separate filesPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>