summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: add opt_find to AVCodecContext class. h264: Complexify frame num gap shortening code intreadwrite.h: fix AV_RL32/AV_RB32 signedness. Fix decoding of mpegts streams with h264 video that does *NOT* have b frames Add minor bumps and APIChanges entries for lavf private options. ffmpeg: deprecate -vc and -tvstd ffmpeg: use new avformat_open_* API. ffserver: use new avformat_open_* API. ffprobe: use new avformat_open_* API. ffplay: use new avformat_open_* API. cmdutils: add opt_default2(). dict: add AV_DICT_APPEND flag. lavf: add avformat_write_header() as a replacement for av_write_header(). Deprecate av_open_input_* and remove their uses. lavf: add avformat_open_input() as a replacement for av_open_input_* AVOptions: add av_opt_find() as a replacement for av_find_opt. AVOptions: add av_opt_set_dict() mapping a dictionary struct to a context. ffmpeg: don't abuse a global for passing frame size from input to output ffmpeg: don't abuse a global for passing pixel format from input to output ffmpeg: initialise encoders earlier. Conflicts: cmdutils.c doc/APIchanges ffmpeg.c ffplay.c ffprobe.c libavcodec/h264.c libavformat/avformat.h libavformat/utils.c libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add minor bumps and APIChanges entries for lavf private options.Anton Khirnov2011-06-16
| |
| * lavf: add avformat_write_header() as a replacement for av_write_header().Anton Khirnov2011-06-16
| | | | | | | | It supports more convenient setting of AVOptions.
| * Deprecate av_open_input_* and remove their uses.Anton Khirnov2011-06-16
| | | | | | | | Deprecate the last remaining member of AVFormatParameters.
| * lavf: add avformat_open_input() as a replacement for av_open_input_*Anton Khirnov2011-06-16
| | | | | | | | Add support for demuxer private options.
* | Support DTS in mp4/mov.Carl Eugen Hoyos2011-06-17
| |
* | Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'Michael Niedermayer2011-06-17
|\| | | | | | | | | | | | | | | | | | | | | * commit '9446d75941d639f19cfa9ae007eb4c5ca041f200': ffmpeg: merge output_codecs array into AVOutputStream members. rtpenc_latm: Consistently use "Libav" in license boilerplate. rtsp: Don't pass string pointer as format string to ff_url_join mmsh: fixed printf injection bug in mmsh request codec-regression: remove pointless -r options for dnxhd Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_latm: Consistently use "Libav" in license boilerplate.Diego Biurrun2011-06-16
| |
| * rtsp: Don't pass string pointer as format string to ff_url_joinMartin Storsjö2011-06-16
| | | | | | | | | | | | | | | | | | In this case, the string that was passed couldn't contain user-defined data and thus there was no risk for injection bugs, but it's safer this way, if we later change the content of the options string. Signed-off-by: Martin Storsjö <martin@martin.st>
| * mmsh: fixed printf injection bug in mmsh requestKirill Zorin2011-06-16
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | mmsh: fix 400 bad requestKirill Zorin2011-06-16
| | | | | | | | | | | | | | | | | | There is no need to write two HTTP newlines (\r\n) into "headers", because http_connect (in http.c) already appends one HTTP newline at the end of the given headers chunk, which would result in sending three HTTP newlines after the headers. Most of the time it's okay (although not RFC-conforming), but many proxy servers and the occasional strict httpd will puke with a "400 bad request".
* | mmsh: fixed printf injection bug in mmsh requestKirill Zorin2011-06-16
| |
* | Make buffer size check consistent and avoid a possible overflow.Reimar Döffinger2011-06-15
| |
* | Fix spelling.Reimar Döffinger2011-06-15
| |
* | Full support for sending H.264 in RTPLuca Abeni2011-06-15
| | | | | | | | | | | | This implements support for the "MP4" syntax of H.264 bitstreams. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support reading chan atoms with empty channel descriptions.Andrew Wason2011-06-15
| | | | | | | | Fixes ticket 263.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (24 commits) utils: Drop pointless '#if 1' preprocessor directive. ac3enc: remove empty ac3_float function that is never called ac3enc: split templated float vs. fixed functions into a separate file. ac3enc: dynamically allocate AC3EncodeContext fields windowed_samples and mdct ac3enc: use function pointer to choose between AC-3 and E-AC-3 header output functions. Roll back 4:4:4 H.264 for now Needs some ARM/PPC asm modifications. Fix SVQ3 after adding 4:4:4 H.264 support H.264: fix CODEC_FLAG_GRAY 4:4:4 H.264 decoding support h264_parser: Fix whitespace after previous change. h264_parser: Fix behaviour when PARSER_FLAG_COMPLETE_FRAMES is set. wav: remove an invalid free(). lavf: initialise reference_dts in av_estimate_timings_from_pts. h264: don't be so picky on decoding pps in extradata. avcodec.h: add or elaborate on some documentation comments. h264: change a few comments into error messages ac3dec: fix doxy-style for comment ("///>" should be "///<" instead). img2: add .dpx to the list of supported file extensions. ffv1: fix undefined behavior with insane widths. ARM: jrevdct_arm: simplify stack usage ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * utils: Drop pointless '#if 1' preprocessor directive.Diego Biurrun2011-06-13
| |
| * wav: remove an invalid free().Carl Eugen Hoyos2011-06-13
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * lavf: initialise reference_dts in av_estimate_timings_from_pts.Michael Niedermayer2011-06-13
| | | | | | | | | | | | Fixes issue2437. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * img2: add .dpx to the list of supported file extensions.Peter Ross2011-06-13
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | matroskadec: properly decode color space in an endian neutral wayAurelien Jacobs2011-06-14
| |
* | matroskadec: use a temporary fourcc variableAurelien Jacobs2011-06-14
| |
* | matroskaenc: ensure the written colorspace don't depend on host endiannessAurelien Jacobs2011-06-14
| |
* | replace remaining usage of deprecated av_metadata_set2() by av_dict_set()Aurelien Jacobs2011-06-13
| |
* | matroskaenc: write colourspace element for rawvideo tracksAurelien Jacobs2011-06-13
| |
* | nsv: simplify probe functionAurelien Jacobs2011-06-13
| |
* | nsv: return error code instead of discarding it in read_header()Aurelien Jacobs2011-06-13
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <michaelni@gmx.at>
| * Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog.Diego Biurrun2011-06-10
| |
| * adts: Adjust frame size mask to follow the specification.Kieran Kunhya2011-06-10
| | | | | | | | | | | | This fixes ADTS detection for at least one sample. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * movenc: Add RTP muxer/hinter optionsMartin Storsjö2011-06-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: Pass the RTP AVFormatContext to the SDP generationMartin Storsjö2011-06-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtspenc: Add RTP muxer optionsMartin Storsjö2011-06-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtspenc: Add an AVClass for setting muxer specific optionsMartin Storsjö2011-06-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpenc_chain: Pass the rtpflags options through to the chained muxerMartin Storsjö2011-06-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpenc: Declare the rtp flags private AVOptions in rtpenc.hMartin Storsjö2011-06-10
| | | | | | | | | | | | | | This allows other muxers that chain a RTP muxer to declare the same options easily. Signed-off-by: Martin Storsjö <martin@martin.st>
| * sdp: Reindent after the previous commitMartin Storsjö2011-06-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpenc: MP4A-LATM payload supportJuan Carlos Rodriguez2011-06-10
| | | | | | | | | | | | | | This is enabled with an AVOption on the RTP muxer. The SDP generator looks for a latm flag in the rtpflags field. Signed-off-by: Martin Storsjö <martin@martin.st>
| * sdp: Allow passing an AVFormatContext to the SDP generationMartin Storsjö2011-06-10
| | | | | | | | | | | | | | Options from the AVFormatContext can be read for modifying the generated SDP. Signed-off-by: Martin Storsjö <martin@martin.st>
| * mov: Fix wrong timestamp generation for fragmented movies that have time ↵Yusuke Nakamura2011-06-10
| | | | | | | | | | | | offset caused by the first edit list entry. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Extract rotation in MOV metadataDave Badia2011-06-10
| |
* | lavf: bump minor after the addition of fps_probe_size to AVFormatContextStefano Sabatini2011-06-10
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: make compute_pkt_fields2() return meaningful error values matroskadec: set timestamps for RealAudio packets. intelh263dec: aspect ratio processing fix. intelh263dec: fix "Strict H.263 compliance" file playback oss,sndio: simplify by using FFMIN. swscale: extract monowhite/black output from yuv2packed[12X]_c(). swscale: de-macro'ify RGB15/16/32 input functions. swscale: rearrange code. movdec: Add support for the 'wfex' atom. ffmpeg.c: Add a necessary const qualifier riff: Fix potential memleak. swscale: change 48bit RGB input macros to inline functions. swscale: change 9/10bit YUV input macros to inline functions. swscale: extract gray16 output functions from yuv2packed[12X](). swscale: use standard clipping functions. swscale: merge macros that are used only once. swscale: fix function declarations in swscale.c. swscale: fix function declaration keywords in x86/swscale_template.c. Conflicts: ffmpeg.c libavcodec/intelh263dec.c libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: make compute_pkt_fields2() return meaningful error valuesStefano Sabatini2011-06-09
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * matroskadec: set timestamps for RealAudio packets.Reimar Döffinger2011-06-09
| | | | | | | | | | | | | | Improves seeking in ffplay with http://samples.mplayerhq.hu/Matroska/RA_missing_timestamps.mkv Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * movdec: Add support for the 'wfex' atom.Alex Converse2011-06-09
| | | | | | | | The 'wfex' is just a Microsoft WaveFormatEx struct.
| * riff: Fix potential memleak.Alex Converse2011-06-09
| | | | | | | | | | Make ff_get_wav_header() free existing extradata before allocing a new buffer.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: crypto: Use av_freep instead of av_free lavf: don't try to free private options if priv_data is NULL. swscale: fix types of assembly arguments. swscale: move two macros that are only used once into caller. swscale: remove unused function. options: Add missing braces around struct initializer. mov: Remove leftover crufty debug statement with references to a local file. dvbsubdec: Fix compilation of debug code. Remove all uses of now deprecated metadata functions. Move metadata API from lavf to lavu. Conflicts: doc/APIchanges libavformat/aiffdec.c libavformat/asfdec.c libavformat/avformat.h libavformat/avidec.c libavformat/cafdec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/wtv.c libavutil/avutil.h libavutil/internal.h libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * crypto: Use av_freep instead of av_freeEtienne Buira2011-06-08
| | | | | | | | | | | | This fixes a potential double free. Signed-off-by: Martin Storsjö <martin@martin.st>