summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Revert needless API change in 05e84c95.Reimar Döffinger2011-06-22
| | | | | | | | | When providing a custom AVIOContex for a AVFMT_NOFILE format only print a warning instead of erroring out. This allows the code to work with older MPlayer versions that just always set pb out of laziness. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-22
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rawdec: Fix decoding of QT WRAW files. configure: report optimization for size separately mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers. mov: Support R10g codec identifier. riff/img2: Add JPEG 2000 codec IDs. riff: Add DAVC fourcc. riff: Add M263, XVIX, MMJP, CDV5 fourccs. rawvideo: Support auv2 fourcc. swscale: Remove unused variable from ff_bfin_get_unscaled_swscale(). h264: Fix assert that failed to compile with -DDEBUG. h264: Add x86 assembly for 10-bit weight/biweight H.264 functions. fate: remove output redirections from old regtest scripts Conflicts: configure libavcodec/rawdec.c libavformat/isom.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers.Carl Eugen Hoyos2011-06-21
| |
| * mov: Support R10g codec identifier.ami_stuff2011-06-21
| |
| * riff/img2: Add JPEG 2000 codec IDs.Kamil Nowosad2011-06-21
| |
| * riff: Add DAVC fourcc.ami_stuff2011-06-21
| | | | | | | | | | This fourcc is used by the "mpegable AVC" codec and files encoded with this codec decode correctly with our H.264 decoder.
| * riff: Add M263, XVIX, MMJP, CDV5 fourccs.Carl Eugen Hoyos2011-06-21
| |
| * rawvideo: Support auv2 fourcc.ami_stuff2011-06-21
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (28 commits) Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). x86: cabac: fix register constraints for 32-bit mode cabac: move x86 asm to libavcodec/x86/cabac.h x86: h264: cast pointers to intptr_t rather than int x86: h264: remove hardcoded edi in decode_significance_8x8_x86() x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86() x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86() x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86() x86: cabac: change 'a' constraint to 'r' in get_cabac_inline() x86: cabac: remove hardcoded esi in get_cabac_inline() x86: cabac: remove hardcoded edx in get_cabac_inline() x86: cabac: remove unused macro parameter x86: cabac: remove hardcoded ebx in inline asm x86: cabac: remove hardcoded struct offsets from inline asm cabac: remove inline asm under #if 0 cabac: remove BRANCHLESS_CABAC_DECODER switch cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED document libswscale bump error_resilience: skip last-MV predictor step if MVs are not available. error_resilience: actually add counter when adding a MV predictor. ... Conflicts: Changelog libavcodec/error_resilience.c libavfilter/defaults.c libavfilter/vf_drawtext.c libswscale/swscale.h tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().Justin Ruggles2011-06-20
| | | | | | | | av_get_bits_per_sample_fmt() is deprecated.
| * mov: Fix empty edit detection.Yusuke Nakamura2011-06-19
| |
* | Fix bink audio playback outside of FFmpeg.Ivan Kalvachev2011-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are 2 known Bink audio codecs. Additionally they have a different flavor if they are found inside Bink-b "BIKb" file. In order to guess the correct flavor, the demuxer sets the audio codec_tag to be the same as the file format tag. This causes problem because same tag is used for both audio codecs. The hack works in FFmpeg because audio codecs are identified by their codec_id, but other players rely on standard behavior. This fix removes the codec_tag hack and instead uses artificial extradata format to signal the codec flavor. This would also allow proper embedding of Bink audio in other containers. Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dump_metadata: Fix 0xd in metadataMichael Niedermayer2011-06-20
| | | | | | | | | | | | Fixed ticket245 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: consider non video to contain only keyframes when seeking.Michael Niedermayer2011-06-20
| | | | | | | | | | | | Fixes Ticket271 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: prevent crash in av_open_input_file() if ap == NULL. more Changelog additions lavf: add a forgotten NULL check in convert_format_parameters(). Fix build if yasm is not available. H.264: Add x86 assembly for 10-bit MC Chroma H.264 functions. Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: prevent crash in av_open_input_file() if ap == NULL.Ronald S. Bultje2011-06-18
| | | | | | | | Needed for proper behaviour in our old API compatibility code.
| * lavf: add a forgotten NULL check in convert_format_parameters().Anton Khirnov2011-06-18
| |
* | avidec: Ignore unknown stream typesami_stuff2011-06-19
| | | | | | | | | | | | Improves ticket131 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>