summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: g723.1: fix addition overflow g723.1: simplify and fix multiplication overflow g723.1: deobfuscate an expression g723.1: remove unused #includes ARM: add missing "cc" clobber in av_clipl_int32_arm() rtmp: Factorize the code by adding handle_invoke_error rtmp: Factorize the code by adding handle_invoke_status rtmp: Factorize the code by adding handle_invoke_result libavutil: remove unused av_abort() macro ffmenc: replace if/abort with assert() libavutil: drop offsetof() fallback definition libavutil: drop fallback definitions of INTxx_MIN/MAX configure: Check for a sctp struct instead of just the header configure: suncc: Add -xc99 to dependency flags, required on Solaris doxygen: Fix function parameter names to match the code doc: Drop obsolete shared libs cflags hint to workaround Cygwin gcc bugs swf: Move shared table out of the header file swf: Move swf_audio_codec_tags table to the only place it is used fate: add G.723.1 decoder tests Conflicts: configure doc/platform.texi libavformat/Makefile libavutil/arm/intmath.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Factorize the code by adding handle_invoke_errorSamuel Pitoiset2012-08-09
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * rtmp: Factorize the code by adding handle_invoke_statusSamuel Pitoiset2012-08-09
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * rtmp: Factorize the code by adding handle_invoke_resultSamuel Pitoiset2012-08-09
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * ffmenc: replace if/abort with assert()Mans Rullgard2012-08-09
| | | | | | | | | | | | | | | | The condition is trivially true, but keeping the assert() is sensible to avoid FFM_HEADER_SIZE ever getting out of sync with the actual code. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * swf: Move shared table out of the header fileDiego Biurrun2012-08-09
| |
| * swf: Move swf_audio_codec_tags table to the only place it is usedDiego Biurrun2012-08-09
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo: reduce excessive inlining of mpeg_motion() mpegvideo: convert mpegvideo_common.h to a .c file build: factor out mpegvideo.o dependencies to CONFIG_MPEGVIDEO Move MASK_ABS macro to libavcodec/mathops.h x86: move MANGLE() and related macros to libavutil/x86/asm.h x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h aacdec: Don't fall back to the old output configuration when no old configuration is present. rtmp: Add message tracking rtsp: Support mpegts in raw udp packets rtsp: Support receiving plain data over UDP without any RTP encapsulation rtpdec: Remove an unused include rtpenc: Remove an av_abort() that depends on user-supplied data vsrc_movie: discourage its use with avconv. avconv: allow no input files. avconv: prevent invalid reads in transcode_init() avconv: rename OutputStream.is_past_recording_time to finished. Conflicts: configure doc/filters.texi ffmpeg.c ffmpeg.h libavcodec/Makefile libavcodec/aacdec.c libavcodec/mpegvideo.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Add message trackingSamuel Pitoiset2012-08-09
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Support mpegts in raw udp packetsMartin Storsjö2012-08-09
| | | | | | | | | | | | | | This is basically the same way as mpegts packets are parsed in rtpdec.c. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Support receiving plain data over UDP without any RTP encapsulationMartin Storsjö2012-08-09
| | | | | | | | | | | | | | EvoStream Media Server can serve data in this format, and VLC/live555 already supports it. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpdec: Remove an unused includeMartin Storsjö2012-08-09
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpenc: Remove an av_abort() that depends on user-supplied dataMartin Storsjö2012-08-09
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) build: cosmetics: Reorder some lists in a more logical fashion x86: pngdsp: Fix assembly for OS/2 fate: add test for RTjpeg in nuv with frameheader rtmp: send check_bw as notification g723_1: clip argument for 15-bit version of normalize_bits() g723_1: use all LPC vectors in formant postfilter id3v2: Support v2.2 PIC avplay: fix build with lavfi disabled. avconv: split configuring filter configuration to a separate file. avconv: split option parsing into a separate file. mpc8: do not leave padding after last frame in buffer for the next decode call mpegaudioenc: list supported channel layouts. mpegaudiodec: don't print an error on > 1 frame in a packet. api-example: update to new audio encoding API. configure: add --enable/disable-random option doc: cygwin: Update list of FATE package requirements build: Remove all installed headers and header directories on uninstall build: change checkheaders to use regular build rules rtmp: Add a new option 'rtmp_subscribe' rtmp: Add support for subscribing live streams ... Conflicts: Makefile common.mak configure doc/examples/decoding_encoding.c ffmpeg.c libavcodec/g723_1.c libavcodec/mpegaudiodec.c libavcodec/x86/pngdsp.asm libavformat/version.h library.mak tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: send check_bw as notificationLuca Barbato2012-08-08
| | | | | | | | | | | | | | Set the transactionId to 0 to signal the server a return _result/_error is not expected. Solves the problems experienced with strict rtmp servers.
| * id3v2: Support v2.2 PICMohammad Alsaleh2012-08-08
| | | | | | | | | | | | | | | | | | | | | | | | id3 v2.2 uses image format ("JPG","PNG") instead of mimetypes. Currently, the attached picture is skipped because the format string does not match a known picture mimetype. This patch fixes this behaviour. Signed-off-by: Mohammad Alsaleh <msal@tormail.org> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * rtmp: Add a new option 'rtmp_subscribe'Samuel Pitoiset2012-08-07
| | | | | | | | | | | | | | This option specifies the name of live stream to subscribe. Defaults to rtmp_playpath. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: Add support for subscribing live streamsSamuel Pitoiset2012-08-07
| | | | | | | | | | | | | | | | When streaming live streams using the Akamai, Edgecast or Limelight CDN, players cannot simply connect to the live stream. Instead, they have to subscribe to it, by sending an FC Subscribe call to the server. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: Factorize simultaneous URLProtocol / AVClass declarations with a macroSamuel Pitoiset2012-08-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/img2dec: add and document pattern_type optionStefano Sabatini2012-08-08
| | | | | | | | | | | | | | | | Allow to override the default 'glob_sequence' value, which is deprecated in favor of the new 'glob' and 'sequence' options. The new pattern types should be easier on the user since they are more predictable than 'glob_sequence', and do not require awkward escaping.
* | lavf/movenc: use two explicit bytes instead of a short.Clément Bœsch2012-08-08
| | | | | | | | | | | | This also avoids a pointless cast. Idea-by: Reimar Döffinger
* | lavf: block special characters in dump metadataMichael Niedermayer2012-08-08
| | | | | | | | | | | | | | | | | | | | This is limited to the chars that arent filtered by av_log() already we might filter more aggressively if theres some case where this becomes needed. Fixes Ticket1181 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: fix lace vs block duration.Michael Niedermayer2012-08-08
| | | | | | | | | | | | | | Fixes Ticket1270 Thanks-to: Moritz Bunkus Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/movenc: add frame rate heuristic for timecode frame rate.Clément Bœsch2012-08-08
| | | | | | | | Fixes ticket 1576.
* | lavf/mxfenc: better error handling with invalid frame rate.Clément Bœsch2012-08-08
| |
* | lavf/mxfenc: simplify frame rate checks.Clément Bœsch2012-08-08
| |
* | rename missed CodecID to AVCodecIDMichael Niedermayer2012-08-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-07
| |
* | Merge commit 'f5d2c597e99af218b0d4d1cf9737c7e68ee934e4'Michael Niedermayer2012-08-07
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f5d2c597e99af218b0d4d1cf9737c7e68ee934e4': build: fix library installation on cygwin mpc8: add a flush function mpc8: set packet duration and stream start time instead of tracking frames Conflicts: libavformat/mpc8.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpc8: set packet duration and stream start time instead of tracking framesJustin Ruggles2012-08-06
| | | | | | | | Fixes mpc8 timestamps.
* | avidec: fix AVStream.info memleak with dv.Michael Niedermayer2012-08-07
| | | | | | | | | | | | Fixes Ticket1334 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: nuv: K&R formatting cosmetics build: generalise rules and variable settings for av* programs nuv: check RTjpeg header for validity Revert "nuv: check per-frame header for validity." imc: remove unused field IMCContext.one_div_log2 imc: fix size of a memset() imc: remove empty if() block fate: simplify variable setting filter.mak lavf: Declare an AVRational struct without a struct literal Conflicts: Makefile configure libavcodec/nuv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Declare an AVRational struct without a struct literalMartin Storsjö2012-08-06
| | | | | | | | | | | | | | At this place, the normal way of initializing a struct works fine, there's no need for a struct literal. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avidec: parse INFO tags at the endMichael Niedermayer2012-08-06
| | | | | | | | | | | | Fixes Ticket1123 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | udp: do not call pthread_{mutex,cond}_destroy when not initialized.anonymous2012-08-06
| | | | | | | | | | | | This seems to cause a crash on Windows. The author of that patch was a random guy on IRC who wants to stay anonymous.
* | mpc8: fix ptsMichael Niedermayer2012-08-06
| | | | | | | | | | | | Fixes Ticket1254 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: dont clip timestamps at 0Michael Niedermayer2012-08-06
| | | | | | | | | | | | Fixes Ticket1251 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenv: fix remuxing of qdm2Piotr Bandurski2012-08-06
| |
* | aiffenc: fix remuxing of qdm2Piotr Bandurski2012-08-06
| |
* | Replace various inlined inverse AVRational with av_inv_q().Clément Bœsch2012-08-06
| |
* | movenc: fix remuxing of svq3Piotr Bandurski2012-08-05
| |
* | oggdec: Initialize stream index to -1 in ogg_packet.Reimar Döffinger2012-08-05
| | | | | | | | | | | | | | | | | | | | The previous method of having to initialize it outside lead to incorrect code: even if it was initialized, it usually was only initialized once, thus a packet that could not be matched to any stream would just be processed with the return values from the previous call. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | oggdec: simplify start time calculation code.Reimar Döffinger2012-08-05
| | | | | | | | | | | | | | Also slightly more correct behaviour in case streams_left for some reason is 0 from the start. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | matroskaenc: Implement support for ALACMoritz Bunkus2012-08-05
| |
* | matroskadec: prevent potential integer overflowMichael Niedermayer2012-08-05
| | | | | | | | | | | | Iam not sure this can happen, but its safer we check. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: Implement support for ALACMoritz Bunkus2012-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch implements support reading ALAC from Matroska files. The only non-trivial thing about it is that only the ALAC magic cookie is stored in Matroska's CodecPrivate element but not the "atom size", "tag" and "tag version" fields that FFMPEG's ALAC decoder expects. However, those are trivial to re-create. Sample files are available: http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska.mka and the CoreAudio file it was created from with today's mkvmerge: http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska-source.caf Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: Fix unfreed memory found by valgrind.Philip Langdale2012-08-05
| | | | | | | | Signed-off-by: Philip Langdale <philipl@overt.org>
* | lavf/img2dec: add start_number_range optionStefano Sabatini2012-08-05
| |
* | oggdec: check stream index before using it in ogg_get_length()Michael Niedermayer2012-08-05
| | | | | | | | | | | | | | | | | | Fixes crash based on a uninitialized array index read. If the read does not crash then out of array writes based on the same index might have been triggered afterwards. Found-by: inferno@chromium.org Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-27 13:40:49 +0000