summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Move id3v2 tag writing to a separate file. swscale: add missing colons to x86 assembly yuv2planeX. g722: split decoder and encoder into separate files cosmetics: remove extra spaces before end-of-statement semi-colons vorbisdec: check output buffer size before writing output wavpack: calculate bpp using av_get_bytes_per_sample() ac3enc: Set max value for mode options correctly lavc: move get_b_cbp() from h263.h to mpeg4videoenc.c mpeg12: move closed_gop from MpegEncContext to Mpeg1Context mpeg12: move full_pel from MpegEncContext to Mpeg1Context mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.h mpegvideo: remove some unused variables from MpegEncContext. Conflicts: libavcodec/mpeg12.c libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move id3v2 tag writing to a separate file.Michael Karcher2011-10-23
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: id3v2: fix doxy comment - 'machine byte order' makes no sense on char arrays VC1: restore mistakenly removed code twinvq: check output buffer size before decoding twinvq: return an error when the packet size is too small lavf: export some forgotten symbols with non-av prefixes. swscale: update altivec yuv2planeX asm to new per-plane API. swscale: make yuv2yuvX_10_sse2/avx 8/9/16-bits aware. yuv2planeX10 SIMD swscale: decide whether to use yuv2plane1/X on a per-plane basis. swscale: reintroduce full precision in 16-bit output. Split up yuv2yuvX functions Split out yuv2yuv1 luma and chroma in order to make them generic DSP functions lavc: replace references to deprecated AVCodecContext.error_recognition to use AVCodecContext.err_recognition lavc: translate non-flag-based er options into flag-based ef options at codec open add -err_filter AVOptions to access flag-based error recognition h264_weight: initialize "height" function argument properly. presets: spelling error in libvpx 1080p50_60 avplay: fix fullscreen behaviour with SDL 1.2.14 on Mac OS X Conflicts: ffplay.c libavformat/libavformat.v libswscale/swscale.c libswscale/x86/swscale_template.c tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * id3v2: fix doxy comment - 'machine byte order' makes no sense on char arraysMichael Karcher2011-10-22
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * lavf: export some forgotten symbols with non-av prefixes.Anton Khirnov2011-10-22
| |
* | Revert "mov: do not misreport empty stts"Carl Eugen Hoyos2011-10-23
| | | | | | | | | | | | Fixes ticket #578. This reverts commit 30c3d976f12665d5d13971172aab062a97cb1bce.
* | Fix comment: Enhanced AC-3 in mov is defined in ETSI TS 102 366.Carl Eugen Hoyos2011-10-22
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (35 commits) flvdec: Do not call parse_keyframes_index with a NULL stream libspeexdec: include system headers before local headers libspeexdec: return meaningful error codes libspeexdec: cosmetics: reindent libspeexdec: decode one frame at a time. swscale: fix signed shift overflows in ff_yuv2rgb_c_init_tables() Move timefilter code from lavf to lavd. mov: add support for hdvd and pgapmetadata atoms mov: rename function _stik, some indentation cosmetics mov: rename function _int8 to remove ambiguity, some indentation cosmetics mov: parse the gnre atom mp3on4: check for allocation failures in decode_init_mp3on4() mp3on4: create a separate flush function for MP3onMP4. mp3on4: ensure that the frame channel count does not exceed the codec channel count. mp3on4: set channel layout mp3on4: fix the output channel order mp3on4: allocate temp buffer with av_malloc() instead of on the stack. mp3on4: copy MPADSPContext from first context to all contexts. fmtconvert: port float_to_int16_interleave() 2-channel x86 inline asm to yasm fmtconvert: port int32_to_float_fmul_scalar() x86 inline asm to yasm ... Conflicts: libavcodec/arm/h264dsp_init_arm.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_ps.c libavcodec/h264dsp_template.c libavcodec/h264idct_template.c libavcodec/h264pred.c libavcodec/h264pred_template.c libavcodec/x86/h264dsp_mmx.c libavdevice/Makefile libavdevice/jack_audio.c libavformat/Makefile libavformat/flvdec.c libavformat/flvenc.c libavutil/pixfmt.h libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: Do not call parse_keyframes_index with a NULL streamReimar Döffinger2011-10-22
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * Move timefilter code from lavf to lavd.Anton Khirnov2011-10-21
| | | | | | | | | | | | It's only used in the JACK device. Fixes linking shared lavd with JACK enabled.
| * mov: add support for hdvd and pgapmetadata atomsRaivo Hool2011-10-21
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * mov: rename function _stik, some indentation cosmeticsRaivo Hool2011-10-21
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * mov: rename function _int8 to remove ambiguity, some indentation cosmeticsRaivo Hool2011-10-21
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * mov: parse the gnre atomRaivo Hool2011-10-21
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * flvenc: store delay and last_ts per-stream.Justin Ruggles2011-10-21
| |
* | mov: support eac3 audioHendrik Leppkes2011-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: remove read_seek()Michael Niedermayer2011-10-21
| | | | | | | | | | | | | | Its redundant Found-by: nevcairiel Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | utils: disable debuging code at the end of av_gen_search()Michael Niedermayer2011-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | utils: flush on successfull av_seek_frame_binary()Michael Niedermayer2011-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: cache information to speed up seeking.Michael Niedermayer2011-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | seek: Fix av_gen_search() so that seeks outside max/min do not successfully ↵Michael Niedermayer2011-10-21
| | | | | | | | | | | | | | | | seek to random points but rather seek to the min/max. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: assert position in dts reading code.Michael Niedermayer2011-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: add and use mpegts_get_dts()Michael Niedermayer2011-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: fix type of argument of mpegts_resync()Michael Niedermayer2011-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix shared lib buildMichael Niedermayer2011-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (47 commits) lavc: hide private symbols. lavc: deprecate img_get_alpha_info(). lavc: use avpriv_ prefix for ff_toupper4. lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits. lavc: use avpriv_ prefix for ff_ac3_parse_header. lavc: use avpriv_ prefix for ff_frame_rate_tab. lavc: rename ff_find_start_code to avpriv_mpv_find_start_code lavc: use avpriv_ prefix for ff_split_xiph_headers. lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header. lavc: use avpriv_ prefix for some dv symbols used in lavf. lavc: use avpriv_ prefix for some flac symbols used in lavf. lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf. lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf. lavc: use avpriv_ prefix for ff_aac_parse_header(). lavf: hide private symbols. lavf: use avpriv_ prefix for some dv functions. lavf: use avpriv_ prefix for ff_new_chapter(). avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2() avcodec: clarify documentation of CODEC_CAP_DELAY ... Conflicts: configure doc/general.texi libavcodec/Makefile libavcodec/aacdec.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/dv.c libavcodec/dvdata.c libavcodec/dvdata.h libavcodec/libspeexenc.c libavcodec/mpegvideo.c libavcodec/version.h libavformat/avidec.c libavformat/dv.c libavformat/dv.h libavformat/flvenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/oggparsespeex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use avpriv_ prefix for ff_toupper4.Anton Khirnov2011-10-20
| | | | | | | | It's used in lavf.
| * lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits.Anton Khirnov2011-10-20
| | | | | | | | They are used in lavf.
| * lavc: use avpriv_ prefix for ff_ac3_parse_header.Anton Khirnov2011-10-20
| | | | | | | | It's used in lavf.
| * lavc: use avpriv_ prefix for ff_frame_rate_tab.Anton Khirnov2011-10-20
| | | | | | | | It's used in lavf.
| * lavc: rename ff_find_start_code to avpriv_mpv_find_start_codeAnton Khirnov2011-10-20
| | | | | | | | It's used in lavf.
| * lavc: use avpriv_ prefix for ff_split_xiph_headers.Anton Khirnov2011-10-20
| | | | | | | | It's used in lavf.
| * lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header.Anton Khirnov2011-10-20
| | | | | | | | It's used in lavf.
| * lavc: use avpriv_ prefix for some dv symbols used in lavf.Anton Khirnov2011-10-20
| | | | | | | | Specifically, ff_dv_frame_profile and ff_dv_codec_profile.
| * lavc: use avpriv_ prefix for some flac symbols used in lavf.Anton Khirnov2011-10-20
| | | | | | | | | | Specifically, ff_flac_parse_streaminfo, ff_flac_is_extradata_valid and ff_flac_parse_block_header
| * lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.Anton Khirnov2011-10-20
| | | | | | | | | | Specifically, ff_mpeg4audio_sample_rates, ff_mpeg4audio_get_config and ff_copy_pce_data
| * lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf.Anton Khirnov2011-10-20
| | | | | | | | | | Specifically, ff_mpa_freq_tab, ff_mpa_bitrate_tab, ff_mpa_decode_header, ff_mpegaudio_decode_header.
| * lavc: use avpriv_ prefix for ff_aac_parse_header().Anton Khirnov2011-10-20
| | | | | | | | It's used in lavf.
| * lavf: hide private symbols.Anton Khirnov2011-10-20
| | | | | | | | Overhead as reported by rbelf-size goes from 40147 to 20877.
| * lavf: use avpriv_ prefix for some dv functions.Anton Khirnov2011-10-20
| | | | | | | | They are used in libavdevice.
| * lavf: use avpriv_ prefix for ff_new_chapter().Anton Khirnov2011-10-20
| | | | | | | | It's used in libavdevice.
| * avformat: do not require frame_size for Speex.Justin Ruggles2011-10-20
| | | | | | | | | | Having it there forces decoding of a frame in order to get frame_size, but it is not really needed for proper demuxing or decoding.
| * ogg/speex: set correct timestamp and duration for the first packet.Justin Ruggles2011-10-20
| | | | | | | | | | The first timestamp should be negative due to delay. Also, do not set AVCodecContext.frame_size unnecessarily.
| * flvenc: check packet duration in speex using timestampsJustin Ruggles2011-10-20
| | | | | | | | Using AVCodecContext.frame_size is not reliable.
| * flvenc: adjust for negative DTS for all codecs, not just H.264Justin Ruggles2011-10-20
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: presets: rename presets directory lavc: make avcodec_get_context_defaults3 "officially" public lavf: replace av_new_stream->avformat_new_stream part II. lavf,lavd: replace av_new_stream->avformat_new_stream part I. lavf: add avformat_new_stream as a replacement for av_new_stream. Use correct scaling table for bwd-pred MVs in second B-field Ut Video decoder Makefile: change presets extension to .avpreset lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs lavfi: add testsrc source AVOptions: add documentation. presets: update libx264 ffpresets Conflicts: Changelog doc/APIchanges doc/ffmpeg.texi ffpresets/libx264-ipod320.ffpreset ffpresets/libx264-ipod640.ffpreset ffserver.c libavcodec/avcodec.h libavcodec/options.c libavcodec/version.h libavdevice/libdc1394.c libavfilter/avfilter.h libavfilter/vsrc_testsrc.c libavformat/flvdec.c libavformat/riff.c libavformat/version.h libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: replace av_new_stream->avformat_new_stream part II.Anton Khirnov2011-10-19
| | | | | | | | | | | | | | | | Manual replacements are done in this commit. In many cases, the id is some constant made up number (e.g. 0 for video and 1 for audio), which is then not used in the demuxer for anything. Those ids are removed.
| * lavf,lavd: replace av_new_stream->avformat_new_stream part I.Anton Khirnov2011-10-19
| | | | | | | | | | Trivial replacements with sed are done in this commit: sed 's/av_new_stream(\([^)]*\), 0)/avformat_new_stream(\1, NULL)/'
| * lavf: add avformat_new_stream as a replacement for av_new_stream.Anton Khirnov2011-10-19
| | | | | | | | It takes a codec parameter, thus enabling codec-specific defaults.
| * Ut Video decoderKostya Shishkov2011-10-19
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>