summaryrefslogtreecommitdiffstats
path: root/libavformat/internal.h
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doxygen: Consistently use '@' instead of '\' for Doxygen markup. Use av_printf_format to check the usage of printf style functions Add av_printf_format, for marking printf style format strings and their parameters ARM: enable thumb for Cortex-M* CPUs nsvdec: Propagate error values instead of returning 0 in nsv_read_header(). build: remove SRC_PATH_BARE variable build: move basic rules and variables to main Makefile build: move special targets to end of main Makefile lavdev: improve feedback in case of invalid frame rate/size vfwcap: prefer "framerate_q" over "fps" in vfw_read_header() v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters() fbdev: prefer "framerate_q" over "fps" in device context bktr: prefer "framerate" over "fps" for grab_read_header() ALSA: implement channel layout for playback. alsa: support unsigned variants of already supported signed formats. alsa: add support for more formats. ARM: allow building in Thumb2 mode Conflicts: common.mak doc/APIchanges libavcodec/vdpau.h libavdevice/alsa-audio-common.c libavdevice/fbdev.c libavdevice/libdc1394.c libavutil/avutil.h Merged-by: Michael Niedermayer <[email protected]>
| * Use av_printf_format to check the usage of printf style functionsMartin Storsjö2011-06-231-1/+1
| | | | | | | | | | | | | | | | This helps catching cases where the format string doesn't match what is passed in, or injection bugs where user data is passed in as format string. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-111-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: bitstream: Properly promote av_reverse values before shifting. libavutil/swscale: YUV444P10/YUV444P9 support. H.264: Fix high bit depth explicit biweight h264: Fix 10-bit H.264 x86 chroma v loopfilter asm. Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog. Update copyright year for ac3enc_opts_template.c. adts: Adjust frame size mask to follow the specification. movenc: Add RTP muxer/hinter options movenc: Pass the RTP AVFormatContext to the SDP generation rtspenc: Add RTP muxer options rtspenc: Add an AVClass for setting muxer specific options rtpenc_chain: Pass the rtpflags options through to the chained muxer rtpenc: Declare the rtp flags private AVOptions in rtpenc.h sdp: Reindent after the previous commit rtpenc: MP4A-LATM payload support avoptions: Add an av_opt_flag_is_set function for inspecting flag fields sdp: Allow passing an AVFormatContext to the SDP generation mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry. mpeg12: more advanced ffmpeg mpeg2 aspect guessing code. swscale: split YUYV output out of yuv2packed[12X]_c(). Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/h264dsp_template.c libavcodec/mpeg12.c libavformat/aacdec.c libavformat/avidec.c libavformat/internal.h libavformat/movenc.c libavformat/rtpenc.c libavformat/rtpenc_latm.c libavformat/sdp.c libavformat/version.h libavutil/avutil.h libavutil/pixfmt.h libswscale/swscale.c Merged-by: Michael Niedermayer <[email protected]>
| * sdp: Allow passing an AVFormatContext to the SDP generationMartin Storsjö2011-06-101-1/+3
| | | | | | | | | | | | | | Options from the AVFormatContext can be read for modifying the generated SDP. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-041-0/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) build: simplify commands for clean target swscale: split swscale.c in unscaled and generic conversion routines. swscale: cosmetics. swscale: integrate (literally) swscale_template.c in swscale.c. swscale: split out x86/swscale_template.c from swscale.c. swscale: enable hScale_altivec_real. swscale: split out ppc _template.c files from main swscale.c. swscale: remove indirections in ppc/swscale_template.c. swscale: split out unscaled altivec YUV converters in their own file. mpegvideoenc: fix multislice fate tests with threading disabled. mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro. build: Simplify texi2html invocation through the --output option. Mark some variables with av_unused Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name(). svq3: Check negative mb_type to fix potential crash. svq3: Move svq3-specific fields to their own context. rawdec: initialize return value to 0. Remove unused get_psnr() prototype rawdec: don't leak option strings. bktr: get default framerate from video standard. ... Merged-by: Michael Niedermayer <[email protected]>
| * mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro.Diego Biurrun2011-06-031-0/+6
| |
* | sdp: Allow passing AVFormatContext flags to the SDP generationMartin Storsjö2011-05-201-1/+2
| |
* | Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45'Michael Niedermayer2011-05-011-4/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '85770f2a2651497861ed938efcd0df3696ff5e45': AVOptions: make default_val a union, as proposed in AVOption2. Move ff_dynarray_add to lavu and make it public. lavf: remove duplicate assignment in avformat_alloc_context. lavf: use designated initializers for AVClasses. options: simplify av_find_opt by using av_next_option. Merged-by: Michael Niedermayer <[email protected]>
| * | Move ff_dynarray_add to lavu and make it public.Anton Khirnov2011-04-291-4/+2
| |/
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-201-12/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <[email protected]>
| * lavf: remove FF_API_URL_SPLIT cruftAnton Khirnov2011-04-191-12/+0
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-091-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: bump minor and add an APIChanges entry for avformat cleanup lavf: get rid of ffm-specific stuff in avformat.h Not pulled: avio: deprecate av_protocol_next(). avio: add a function for iterating though protocol names. lavf: rename a parameter of av_sdp_create from buff->buf lavf: rename avf_sdp_create to av_sdp_create. lavf: make av_guess_image2_codec internal avio: make URLProtocol internal. avio: make URLContext internal. lavf: mark av_pkt_dump(_log) for remove on $next+1 bump. lavf: use designated initializers for all protocols applehttp: don't use deprecated url_ functions. avio: move two ff_udp_* functions from avio_internal to url.h asfdec: remove a forgotten declaration of nonexistent function avio: deprecate the typedef for URLInterruptCB Merged-by: Michael Niedermayer <[email protected]>
| * lavf: make av_guess_image2_codec internalAnton Khirnov2011-04-081-0/+2
| | | | | | | | It doesn't look very useful as a public function.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <[email protected]>
* lavf: Make make_absolute_url a lavf internal functionMartin Storsjö2011-03-171-0/+11
| | | | | | This is shared by both applehttp demuxer and protocol. Signed-off-by: Luca Barbato <[email protected]>
* avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-201-4/+4
| | | | Signed-off-by: Ronald S. Bultje <[email protected]>
* Deprecate parse_date() in favor of av_parse_time().Stefano Sabatini2011-02-161-3/+0
| | | | | | | | The new av_parse_time() is created in libavutil/parseutils.h, all the internal functions used by parse_date are moved to libavutil/parseutils.c and made static. Signed-off-by: Mans Rullgard <[email protected]>
* lavf: rename ff_probe_input_buffer to make it publicAnssi Hannula2011-02-081-19/+0
| | | | | | | It is useful for applications that hand input data directly to lavf via a ByteIOContext. Signed-off-by: Ronald S. Bultje <[email protected]>
* lavf: simplify pb parameter of ff_probe_input_bufferAnssi Hannula2011-02-081-1/+1
| | | | | | | There is no need to pass the ByteIOContext via a pointer to a pointer anymore. Signed-off-by: Ronald S. Bultje <[email protected]>
* lavf: update ff_probe_input_buffer documentationAnssi Hannula2011-02-081-1/+1
| | | | | | It never reopens the bytestream anymore. Signed-off-by: Ronald S. Bultje <[email protected]>
* lavf: move internal functions from avformat.h to internal.hAnton Khirnov2011-02-061-0/+21
| | | | Signed-off-by: Ronald S. Bultje <[email protected]>
* add ff_index_search_timestamp and ff_add_index_entryPeter Ross2011-02-031-0/+14
| | | | Signed-off-by: Ronald S. Bultje <[email protected]>
* add ff_find_stream_indexPeter Ross2010-12-261-0/+6
| | | | Originally committed as revision 26092 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add FF_API_URL_SPLIT define to disable the deprecated ff_url_split() functionAurelien Jacobs2010-10-151-1/+1
| | | | Originally committed as revision 25482 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Properly handle IPv6 addresses in the SDP generationMartin Storsjö2010-08-251-1/+3
| | | | Originally committed as revision 24915 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move the definition of the maximum url size for static buffers to internal.hMartin Storsjö2010-08-191-0/+2
| | | | Originally committed as revision 24833 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make parse_key_value from httpauth a common lavf internal functionMartin Storsjö2010-08-191-0/+24
| | | | Originally committed as revision 24832 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make hex_to_data a lavf internal functionMartin Storsjö2010-08-091-0/+10
| | | | | | This is useful for other future RTP depacketizers Originally committed as revision 24747 to svn://svn.ffmpeg.org/ffmpeg/trunk
* document ff_get_line()Aurelien Jacobs2010-07-211-0/+11
| | | | Originally committed as revision 24401 to svn://svn.ffmpeg.org/ffmpeg/trunk
* improve ff_get_line to return line lengthAurelien Jacobs2010-07-211-1/+1
| | | | Originally committed as revision 24400 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move ff_get_line to aviobuf.cAurelien Jacobs2010-07-211-0/+2
| | | | Originally committed as revision 24399 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move SPACE_CHARS back to libavformat/internal.hMartin Storsjö2010-07-161-0/+2
| | | | | | It will be used by other parts of lavf now. This reverts svn rev 23846. Originally committed as revision 24265 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move ff_get_v_length and ff_put_v from nutenc.c to internal.h/aviobuf.cMichael Chinen2010-07-091-0/+10
| | | | | | patch by Micheal Chinen < mchinen gmail > Originally committed as revision 24140 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix grammar errors in documentationMåns Rullgård2010-06-301-4/+4
| | | | Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rtpdec: Move space_chars from avformat/internal to rtpdecJosh Allmann2010-06-281-2/+0
| | | | | | Patch by Josh Allmann, joshua dot allmann at gmail Originally committed as revision 23846 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ff_url_split() publicMåns Rullgård2010-06-271-22/+5
| | | | | | | ff_url_split() is retained as an alias, as it was used by ffserver, to avoid breaking ABI compatibility with it. Originally committed as revision 23822 to svn://svn.ffmpeg.org/ffmpeg/trunk
* RTSP: Remove skip_spaces in favor of strspnJosh Allmann2010-06-251-0/+2
| | | | | | Patch by Josh Allmann, joshua dot allmann at gmail Originally committed as revision 23768 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ff_url_join: Don't add any at-char if the auth is an empty stringMartin Storsjö2010-06-191-1/+2
| | | | Originally committed as revision 23650 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move AVCodecTag from riff.h into internal.h.Francesco Lavra2010-05-221-0/+5
| | | | | | Patch by Francesco Lavra, francescolavra interfree it Originally committed as revision 23250 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a libavformat internal function ff_write_chainedMartin Storsjö2010-05-211-0/+14
| | | | Originally committed as revision 23207 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ff_sdp_write_media a lavf-internal functionMartin Storsjö2010-05-181-0/+17
| | | | | | | This is in preparation for RTP hinting in the MOV muxer, where it needs to be able to create SDP fragments for each media stream. Originally committed as revision 23160 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move the internal function declarations in avformat.h to internal.h.Stefano Sabatini2010-04-111-0/+22
| | | | Originally committed as revision 22843 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a lowercase parameter to ff_data_to_hexMartin Storsjö2010-03-251-1/+1
| | | | Originally committed as revision 22665 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rename av_read_frame_flush to ff_read_frame_flushAurelien Jacobs2010-03-151-1/+1
| | | | | | it is an internal function, not part of public API Originally committed as revision 22562 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rename av_program_add_stream_index to ff_program_add_stream_indexAurelien Jacobs2010-03-151-1/+1
| | | | | | it is an internal function, not part of public API Originally committed as revision 22561 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move the NTP offset definitions to internal.hMartin Storsjö2010-03-151-0/+3
| | | | Originally committed as revision 22542 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move ff_url_split() and ff_url_join() declarations to internal.hAurelien Jacobs2010-03-141-0/+53
| | | | | | those functions are not part of the public API Originally committed as revision 22534 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move the probe loop from av_open_input_file() into its own methodMicah F. Galizia2010-03-141-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | av_probe_input_buffer() so that it can be reused. Here are a few differences to the original way things were probed: - maximum probe buffer size can be specified as a parameter. - offset within the stream to probe from can be specified as a parameter. - instead of seeking back to the start each time a probe fails, stream data is appended to the reallocated buffer. This lowers the amount of data read from the stream (there is no repetition) and results in fewer closed and reopened streams (when seeking fails). New attempt after r22296, which was revert in r22315 due to a FATE failure. See the thread: Subject: [FFmpeg-devel] [PATCH] Move av_open_input_file probe loop to its own method Date: 2010-03-05 03:23:57 GMT Patch by Micah F. Galizia printf("%s%s@%s.%s", "micah", "galizia", "gmail", "com"). Originally committed as revision 22532 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make the ntp_time function available to other parts of libavformat, as ↵Martin Storsjö2010-03-101-0/+3
| | | | | | ff_ntp_time Originally committed as revision 22438 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Revert "Move the probe loop from av_open_input_file() into its own method"Måns Rullgård2010-03-081-20/+0
| | | | | | | This reverts r22296. This change made some files to fail to open. The patch submitter has promised to investigate next week. Originally committed as revision 22315 to svn://svn.ffmpeg.org/ffmpeg/trunk