summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-23
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: v410dec: Implement explode mode support zerocodec: fix direct rendering. wav: init st to NULL to avoid a false-positive warning. wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit h264: refactor NAL decode loop RTMPTE protocol support RTMPE protocol support rtmp: Add ff_rtmp_calc_digest_pos() rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global swscale: add missing HAVE_INLINE_ASM check. lavfi: place x86 inline assembly under HAVE_INLINE_ASM. vc1: Add a test for interlaced field pictures swscale: Mark all init functions as av_cold swscale: x86: Drop pointless _mmx suffix from filenames lavf: use conditional notation for default codec in muxer declarations. swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM. dsputil: ppc: cosmetics: pretty-print dsputil: x86: add SHUFFLE_MASK_W macro configure: respect CC_O setting in check_cc Conflicts: Changelog configure libavcodec/v410dec.c libavcodec/zerocodec.c libavformat/asfenc.c libavformat/version.h libswscale/utils.c libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wav: init st to NULL to avoid a false-positive warning.Clément Bœsch2012-07-23
| | | | | | | | | | | | | | | | | | | | | | | | If st is NULL, it means no 'fmt ' tag is found, but 'data' tag (which needs a previous 'fmt ' tag to be parsed correctly and st initialized) check will make sure st is never dereferenced in that case. Fixes warning: libavformat/wav.c: In function ‘wav_read_header’: libavformat/wav.c:499:44: warning: ‘st’ may be used uninitialized in this function [-Wmaybe-uninitialized] Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * RTMPTE protocol supportSamuel Pitoiset2012-07-23
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * RTMPE protocol supportSamuel Pitoiset2012-07-23
| | | | | | | | | | | | | | | | | | | | This adds two protocols, but one of them is an internal implementation detail just used as an abstraction layer/generalization in the code. The RTMPE protocol implementation uses ffrtmpcrypt:// as an alternative to the tcp:// protocol. This allows moving most of the lower level logic out from the higher level generic rtmp code. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: Add ff_rtmp_calc_digest_pos()Samuel Pitoiset2012-07-23
| | | | | | | | | | | | | | This function is used for calculating digest position for RTMP handshake packets. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it globalSamuel Pitoiset2012-07-23
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: use conditional notation for default codec in muxer declarations.Ronald S. Bultje2012-07-22
| | | | | | | | | | This removes the use of macro nesting in these code constructs, which makes it easier to parse in pre-processors.
* | Merge remote-tracking branch 'dwbuiten/master'Michael Niedermayer2012-07-23
|\ \ | | | | | | | | | | | | | | | | | | * dwbuiten/master: wav: Add check for 'fmt' tag in SMV code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | wav: Add check for 'fmt' tag in SMV codeDerek Buitenhuis2012-07-22
| | | | | | | | | | | | | | | | | | | | | If there is a 'SMV0' tag, but no 'fmt' tag, it is possible that 'st' got used as NULL. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-22
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: FATE: fix the asyncts test build: Drop gcc-specific warning flag from header compilation rule FATE: add a test for the asyncts audio filter. matroskadec: return more correct error code on read error. buffersrc: check ff_get_audio_buffer() for errors. lavfi: check all ff_get_video_buffer() calls for errors. lavfi: check all avfilter_ref_buffer() calls for errors. vf_select: avoid an unnecessary avfilter_ref_buffer(). buffersrc: avoid creating unnecessary buffer reference lavfi: use avfilter_unref_bufferp() where appropriate. vf_fps: add more error checks. vf_fps: fix a memleak on malloc failure. lavfi: check all ff_start_frame/draw_slice/end_frame calls for errors lavfi: add error handling to end_frame(). lavfi: add error handling to draw_slice(). lavfi: add error handling to start_frame(). Conflicts: Makefile ffplay.c libavfilter/buffersrc.c libavfilter/vf_boxblur.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_frei0r.c libavfilter/vf_hflip.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/video.c libavfilter/vsrc_color.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | matroskadec: return more correct error code on read error.Anton Khirnov2012-07-22
| | |
* | | Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'Michael Niedermayer2012-07-22
|\| | | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea': Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxer G.723.1 demuxer and decoder Add a shift parameter to celp_lp_synthesis_filter() libopenjpeg: K&R formatting cosmetics yadif: use emms_c() instead of inline assembly for emms invocations. ac3: don't use different names for option tables in the template file. lavfi: use const for AVFilterPad declarations in all filters. adpcm: don't duplicate identical AVSampleFmt array for each encoder. configure: cosmetics: Group test dependencies together configure: add more passthrough flags in tms470 filter configure: move flag filtering functions out of if/else blocks Conflicts: Changelog configure doc/general.texi libavcodec/Makefile libavcodec/ac3enc_fixed.c libavcodec/allcodecs.c libavcodec/eac3enc.c libavcodec/g723_1.c libavcodec/g723_1_data.h libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/v210dec.h libavcodec/version.h libavfilter/af_anull.c libavfilter/asrc_anullsrc.c libavfilter/f_settb.c libavfilter/fifo.c libavfilter/split.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_copy.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_format.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hflip.c libavfilter/vf_hqdn3d.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_null.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_pixdesctest.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_setpts.c libavfilter/vf_showinfo.c libavfilter/vf_slicify.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_vflip.c libavfilter/vf_yadif.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c libavformat/Makefile libavformat/allformats.c libavformat/g723_1.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxerKostya Shishkov2012-07-22
| |
| * G.723.1 demuxer and decoderMohamed Naufal Basheer2012-07-22
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | tls: TLS/SSL serverPeter Ross2012-07-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tls: parse uri path options to underlying tcp URLContextPeter Ross2012-07-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tls: verify optionPeter Ross2012-07-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tls: cafile, cert, key optionsPeter Ross2012-07-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | av_url_split: dont let '/' char whallop '?' charPeter Ross2012-07-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix yuv4mpeg parsing of 'mono16' files.Steven Robertson2012-07-22
| | | | | | | | | | 'mono' came before 'mono16' in the list of colorspace alternatives, causing files of the latter type to be parsed as the former.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: swscale: Place inline assembly code under appropriate #ifdefs rtsp: remove terminal comma in FF_RTP_FLAG_OPTS macro. configure: Remove redundant RTMPT/RTMPTS dependencies configure: add filtering of host cflags/ldflags configure: initialise all flag filters at the same place configure: add filtering of linker flags configure: name some variables more consistently configure: remove filter_cppflags configure: set icc_version where it is needed mpegenc: remove disabled code Conflicts: configure libavformat/movenc.c libswscale/x86/swscale_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: remove terminal comma in FF_RTP_FLAG_OPTS macro.Ronald S. Bultje2012-07-21
| | | | | | | | | | | | | | This makes usage of the macro look more natural when used with array entries. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mpegenc: remove disabled codeDiego Biurrun2012-07-21
| |
* | iff: pass context to av_log_ask_for_samplePaul B Mahol2012-07-21
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | iff: remove dupe ID_ANNO definitionPaul B Mahol2012-07-21
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | riff: add G723_1 wav tagPiotr Bandurski2012-07-21
| | | | | | | | | | Reveiwed-by: compn <tempn@twmi.rr.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libopenjpeg: introduce lowres and lowqual private options FATE: add a test for flac cover art. cafdec: allow larger ALAC magic cookie alac: fix channel pointer assignment for 24 and 32-bit Conflicts: libavcodec/alac.c libavcodec/libopenjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cafdec: allow larger ALAC magic cookieJustin Ruggles2012-07-19
| | | | | | | | | | It already skips any extra bytes at the end, and apparently there are some samples in the wild with larger 'kuki' chunks.
* | udp: fix compilation when HAVE_PTHREAD_CANCEL isnt definedMichael Niedermayer2012-07-20
| | | | | | | | | | | | | | | | This happens with for example mplayer. Fixing it in ffmpeg allows new ffmpeg to be compiled with older mplayer which would not be possible if the fix was just in mplayer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: make cmdutils's check_stream_specifier public.Nicolas George2012-07-20
| | | | | | | | | | The new function is called avformat_match_stream_specifier() and does not include logging the error message.
* | matroska: add support for Opus.Nicolas George2012-07-20
| | | | | | | | Opus in Matroska is still a draft.
* | oggdec: add support for Opus codec.Nicolas George2012-07-20
| | | | | | | | This patch also introduces CODEC_ID_OPUS.
* | lavf: count skipped samples for initial timestamps.Nicolas George2012-07-19
| | | | | | | | | | | | If skip_samples is set and timestamps are synthesized using durations, make them start at -skip_samples (rescaled) instead of 0, so that the timestamp of the first undiscarded sample is 0.
* | lavf: set pkt_timebase at the same time as stream->time_base.Nicolas George2012-07-19
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (38 commits) alac: cosmetics: general pretty-printing and comment clean up alac: calculate buffer size outside the loop in allocate_buffers() alac: change some data types to plain int alac: cosmetics: rename some variables and function names alac: multi-channel decoding support alac: split element parsing into a separate function alac: support a read sample size of up to 32 alac: output in planar sample format alac: add 32-bit decoding support alac: simplify channel interleaving alac: use AVPacket fields directly in alac_decode_frame() alac: fix check for valid max_samples_per_frame alac: use get_sbits() to read LPC coefficients instead of casting alac: move the current samples per frame to the ALACContext alac: avoid using a double-negative when checking if the frame is compressed alac: factor out output_size check in predictor_decompress_fir_adapt() alac: factor out loading of next decoded sample in LPC prediction alac: use index into buffer_out instead of incrementing the pointer alac: simplify lpc coefficient adaptation alac: reduce the number of local variables needed in lpc prediction ... Conflicts: libavcodec/alac.c libavformat/cafdec.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: move 'chan' tag parsing to mov_chan.c to share with the CAF demuxerJustin Ruggles2012-07-19
| |
| * caf: use int64_t for num_packetsJustin Ruggles2012-07-19
| | | | | | | | It is used to store a value read by avio_rb64().
| * caf: fix 'pakt' chunk parsingJustin Ruggles2012-07-19
| | | | | | | | | | | | according to the CAF specification: "... the value for mChunkSize can be greater than the actual valid content of the packet table chunk"
| * caf: support either old or new style ALAC magic kuki chunkJustin Ruggles2012-07-19
| |
* | lavf/udp: warn in case the circular_buffer_size or overrun_nonfatal options ↵Stefano Sabatini2012-07-19
| | | | | | | | | | | | are not supported They are only supported if pthread is available.
* | mxfdec: simplify code by using av_calloc()Michael Niedermayer2012-07-19
| | | | | | | | | | Reviewed a long time ago by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: Mark first frame as keyframe in case there are no keyframes.Michael Niedermayer2012-07-19
| | | | | | | | | | | | This fixes seeking in filecopy.avi of Ticket504 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ppc: fix build with altivec disabled vp3: move idct and loop filter pointers to new vp3dsp context build: add CONFIG_VP3DSP, reduce repetition in OBJS lists tscc2: do not add/subtract 128 bias during DCT tscc2: fix typo in DCT configure: clarify external library section of help output configure: mark libfdk-aac as nonfree configure: cosmetics: drop some unnecessary backslashes os_support: K&R formatting cosmetics Conflicts: configure libavcodec/vp3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * os_support: K&R formatting cosmeticsDiego Biurrun2012-07-17
| |
* | lavf/utils: show the number of stream in case of missing parameterStefano Sabatini2012-07-18
| | | | | | | | Increase feedback provided in avformat_find_stream_info().
* | lavf/utils: suggest what to do in case of missing codec informationStefano Sabatini2012-07-18
| | | | | | | | In particular, fix trac issue #218.
* | lavf/utils: extend has_codec_parameters() to make it show what info is missingStefano Sabatini2012-07-18
| | | | | | | | Improve feedback.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libopenjpeg: introduce encoding support libopenjpeg: rename decoder source file. RTMPTS protocol support RTMPS protocol support avconv: print an error message when demuxing fails. tscc2: DCT output should not be clipped rtmp: Rename rtmphttp to ffrtmphttp Conflicts: Changelog configure doc/general.texi libavcodec/libopenjpegenc.c libavcodec/version.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * RTMPTS protocol supportSamuel Pitoiset2012-07-17
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * RTMPS protocol supportSamuel Pitoiset2012-07-17
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-12 04:22:58 +0000