summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
| * doxygen: use Doxygen markup for authors and web links where appropriateDiego Biurrun2011-07-154-8/+4
| |
| * doxygen: do not include license boilerplate in Doxygen documentationDiego Biurrun2011-07-152-4/+7
| |
| * doxygen: consistently place brief descriptionDiego Biurrun2011-07-143-3/+3
| |
| * doxygen: place empty line between brief description and detailed descriptionDiego Biurrun2011-07-142-1/+3
| | | | | | | | Without it, Doxygen cannot separate them into different sections.
| * avformat_open_input(): Add braces to shut up gcc warning.Diego Biurrun2011-07-141-1/+1
| | | | | | | | | | libavformat/utils.c:599: warning: missing braces around initializer libavformat/utils.c:599: warning: (near initialization for ‘ap.time_base’)
* | wtvdec: also support big-sectors when fat depth is zeroPeter Ross2011-07-151-3/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-145-14/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: APIchanges: fill in missing hashes and dates. Add an APIChanges entry and bump minor versions for recent changes. ffmpeg: print the low bitrate warning after the codec is openend. doxygen: Move function documentation into the macro generating the function. doxygen: Make sure parameter names match between .c and .h files. h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h H.264: Add more x86 assembly for 10-bit H.264 predict functions lavf: fix invalid reads in avformat_find_stream_info() cmdutils: replace opt_default with opt_default2() and remove set_context_opts ffmpeg: use new avcodec_open2 and avformat_find_stream_info API. ffplay: use new avcodec_open2 and avformat_find_stream_info API. cmdutils: store all codec options in one dict instead of video/audio/sub ffmpeg: check experimental flag after codec is opened. ffmpeg: do not set GLOBAL_HEADER flag in the options context Conflicts: cmdutils.c doc/APIchanges ffmpeg.c ffplay.c libavcodec/version.h libavformat/version.h libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <[email protected]>
| * Add an APIChanges entry and bump minor versions for recent changes.Anton Khirnov2011-07-141-1/+1
| |
| * doxygen: Make sure parameter names match between .c and .h files.Diego Biurrun2011-07-143-12/+12
| |
| * lavf: fix invalid reads in avformat_find_stream_info()Anton Khirnov2011-07-141-1/+1
| |
* | seektest: forgot adding a file (from commit ↵Michael Niedermayer2011-07-141-0/+133
| | | | | | | | | | | | 191c5f8ff33eb995b6dbc5b11af7c1a79f8381f0 during the last merge) Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'b5849f77095439e994b11c25e6063d443b36c228'Michael Niedermayer2011-07-1410-46/+186
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b5849f77095439e994b11c25e6063d443b36c228': (21 commits) ac3enc: merge AC3MDCTContext with AC3EncodeContext. ac3enc: prefer passing AC3EncodeContext rather than AVCodecContext ac3enc: fix memleak mpeg1video: add CODEC_CAP_SLICE_THREADS. lavf: fix segfault in av_open_input_stream() mpegtsenc: set Random Access indicator on keyframe start packets lavf: Cleanup try_decode_frame() logic. Replace some gotos that lead to single return statements by direct return. build: move tests/seek_test.c to libavformat and reuse generic build rules mxfenc: include needed header for ff_iso8601_to_unix_time() prototype Add a check for strptime(). lavf: factor out conversion of ISO8601 string to unix time wav: parse 'bext' metadata wav: keep parsing until EOF if the input is seekable and we know the size of the data tag wav: Refactor the tag checking into a switch statement wav: make sure neither data_size nor sample_count is negative. wav: refactor the 'fmt ' tag search and parsing. wav: add an option for writing BEXT chunk ffmpeg: get rid of a pointless limit on number of streams. ffmpeg: remove an unused define. ... Merged-by: Michael Niedermayer <[email protected]>
| * lavf: fix segfault in av_open_input_stream()Anton Khirnov2011-07-131-1/+2
| | | | | | | | ic is NULL in case of error.
| * mpegtsenc: set Random Access indicator on keyframe start packetsJindrich Makovicka2011-07-131-11/+56
| | | | | | | | | | Signed-off-by: Jindrich Makovicka <[email protected]> Signed-off-by: Anton Khirnov <[email protected]>
| * lavf: Cleanup try_decode_frame() logic.Alex Converse2011-07-131-6/+3
| | | | | | | | This fixes AAC playback in ffplay.
| * build: move tests/seek_test.c to libavformat and reuse generic build rulesDiego Biurrun2011-07-132-1/+134
| |
| * mxfenc: include needed header for ff_iso8601_to_unix_time() prototypeKostya Shishkov2011-07-131-0/+1
| | | | | | | | Signed-off-by: Mans Rullgard <[email protected]>
| * Add a check for strptime().Anton Khirnov2011-07-131-0/+6
| | | | | | | | It's an XSI extension, not available on some supported systems.
| * lavf: factor out conversion of ISO8601 string to unix timeAnton Khirnov2011-07-136-21/+20
| |
| * wav: parse 'bext' metadataTomas Härdin2011-07-131-0/+101
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
| * wav: keep parsing until EOF if the input is seekable and we know the size of ↵Tomas Härdin2011-07-131-15/+32
| | | | | | | | | | | | the data tag Signed-off-by: Anton Khirnov <[email protected]>
| * wav: Refactor the tag checking into a switch statementTomas Härdin2011-07-131-4/+9
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
| * wav: make sure neither data_size nor sample_count is negative.Tomas Härdin2011-07-131-0/+6
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
| * wav: refactor the 'fmt ' tag search and parsing.Tomas Härdin2011-07-131-18/+39
| | | | | | | | | | | | | | | | Moving the search and parsing of the 'fmt ' info the main loop of wav_read_header() allows tags that precede it to be parsed. Creating wav_parse_fmt_tag() makes wav_read_header() easier to read. Signed-off-by: Anton Khirnov <[email protected]>
| * wav: add an option for writing BEXT chunkBenjamin Larsson2011-07-131-0/+78
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
| * Musepack SV7: try to read files without number of frames providedKostya Shishkov2011-07-131-4/+12
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-138-10/+67
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doc: Improve references to external URLs. h264: move decode_mb_skip() from h264.h to h.264_mvpred.h ffplay: skip return value of avcodec_decode_video2 / avcodec_decode_subtitle2 dnxhdenc: Replace a forward declaration by the proper #include. h264: move h264_mvpred.h include. pix_fmt: Fix number of bits per component in yuv444p9be lavf: deprecate AVFormatContext.timestamp ffmpeg: merge input_files_ts_scale into InputStream. ffmpeg: don't abuse a global for passing sample format from input to output ffmpeg: don't abuse a global for passing channel layout from input to output ffmpeg: factor common code from new_a/v/s/d_stream to new_output_stream() matroskaenc: make SSA default subtitle codec. oggdec: prevent heap corruption. Conflicts: doc/developer.texi doc/faq.texi doc/general.texi ffmpeg.c ffplay.c Merged-by: Michael Niedermayer <[email protected]>
| * lavf: deprecate AVFormatContext.timestampAnton Khirnov2011-07-126-7/+63
| | | | | | | | It's replaced by 'creation_time' metadata tag.
| * matroskaenc: make SSA default subtitle codec.Anton Khirnov2011-07-121-1/+1
| | | | | | | | | | It's a better format and we have an encoder for it, so it doesn't fail like CODEC_ID_TEXT.
| * oggdec: prevent heap corruption.Chris Evans2011-07-111-2/+3
| | | | | | | | | | | | | | | | Specifically crafted samples can reinit ogg->streams[] while reading samples, and thus we should not cache old pointers since these may no longer be valid. Signed-off-by: Ronald S. Bultje <[email protected]>
* | Move resetting of channels, sample_rate back to av_find_stream_info.Reimar Döffinger2011-07-121-0/+9
| | | | | | | | | | | | | | | | | | | | Resetting it on codec init would incorrectly clear the values if av_find_stream_info was already run before, in particular breaking ffplay. This fixes trac tickets #213 and #262. Signed-off-by: Reimar Döffinger <[email protected]>
* | Support adpcm_ima_wav and adpcm_ms in caf.Carl Eugen Hoyos2011-07-122-2/+8
| |
* | Add another MP3 CAF codec tag.Carl Eugen Hoyos2011-07-121-0/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-121-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: changelog: misc typo and wording fixes H.264: add filter_mb_fast support for >8-bit decoding doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. lls: use av_lfg instead of rand() in test program build: remove unnecessary dependency on libs from 'all' target H.264: avoid redundant alpha/beta calculations in loopfilter H.264: optimize intra/inter loopfilter decision mpegts: fix Continuity Counter error detection build: remove unnecessary FFLDFLAGS variable vp8/mt: flush worker thread, not application thread context, on seek. mt: proper locking around release_buffer calls. DxVA2: unbreak build after [657ccb5ac75ce34e62bd67f228d9bd36db72189e] hwaccel: unbreak build Eliminate FF_COMMON_FRAME macro. Conflicts: Changelog Makefile doc/developer.texi libavcodec/avcodec.h libavcodec/h264.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <[email protected]>
| * mpegts: fix Continuity Counter error detectionJindrich Makovicka2011-07-111-2/+3
| | | | | | | | | | | | | | | | | | According to MPEG-TS specs, the continuity_counter shall not be incremented when the adaptation_field_control of the packet equals '00' or '10'. Signed-off-by: Jindrich Makovicka <[email protected]> Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'Michael Niedermayer2011-07-116-64/+141
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '142e76f1055de5dde44696e71a5f63f2cb11dedf': swscale: fix crash with dithering due incorrect offset calculation. matroskadec: fix stupid typo (!= -> ==) build: remove duplicates from order-only directory prerequisite list build: rework rules for things in the tools dir configure: fix --cpu=host with gcc 4.6 ARM: use const macro to define constant data in asm bitdepth: simplify FUNC/FUNCC macros dsputil: remove ff_emulated_edge_mc macro used in one place 9/10-bit: simplify clipping macros matroskadec: reindent matroskadec: defer parsing of cues element until we seek. lavc: add support for codec-specific defaults. lavc: make avcodec_alloc_context3 officially public. lavc: remove a half-working attempt at different defaults for audio/video codecs. ac3dec: add a drc_scale private option lavf: add avformat_find_stream_info() lavc: introduce avcodec_open2() as a replacement for avcodec_open(). Conflicts: Makefile libavcodec/utils.c libavformat/avformat.h libswscale/swscale_internal.h Merged-by: Michael Niedermayer <[email protected]>
| * matroskadec: fix stupid typo (!= -> ==)Anton Khirnov2011-07-101-1/+1
| | | | | | | | Signed-off-by: Mans Rullgard <[email protected]>
| * build: rework rules for things in the tools dirMans Rullgard2011-07-101-0/+1
| | | | | | | | | | | | | | | | Declaring tools associated with each library in their respective makefiles allows these tools to easily depend on the correct prerequisites and link against the libs they need. Signed-off-by: Mans Rullgard <[email protected]>
| * matroskadec: reindentAnton Khirnov2011-07-101-15/+15
| |
| * matroskadec: defer parsing of cues element until we seek.Aaron Colwell2011-07-101-45/+86
| | | | | | | | | | | | | | This decreases startup latency. Signed-off-by: Ronald S. Bultje <[email protected]> Signed-off-by: Anton Khirnov <[email protected]>
| * lavc: make avcodec_alloc_context3 officially public.Anton Khirnov2011-07-103-3/+3
| | | | | | | | Deprecate avcodec_alloc_context/2.
| * lavf: add avformat_find_stream_info()Anton Khirnov2011-07-102-5/+40
| | | | | | | | It supports passing options to codecs.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-102-17/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) H.264: fix filter_mb_fast with 4:4:4 + 8x8dct alsa: limit buffer_size to 32768 frames. alsa: fallback to buffer_size/4 for period_size. doc: replace @pxref by @ref where appropriate mpeg1video: don't abort if thread_count is too high. segafilm: add support for videos with cri adx adpcm gxf: Fix 25 fps DV material in GXF being misdetected as 50 fps libxvid: Add const qualifier to silence compiler warning. H.264: improve qp_thresh check H.264: use fill_rectangle in CABAC decoding H.264: Remove redundant hl_motion_16/8 code H.264: merge fill_rectangle into P-SKIP MV prediction, to match B-SKIP H.264: faster P-SKIP decoding H.264: av_always_inline some more functions H.264: Add x86 assembly for 10-bit H.264 predict functions swscale: rename uv_off/uv_off2 to uv_off_px/byte. swscale: implement error dithering in planarCopyWrapper. swscale: error dithering for 16/9/10-bit to 8-bit. swscale: fix overflow in 16-bit vertical scaling. swscale: fix crash in 8-bpc bilinear output without alpha. ... Conflicts: doc/developer.texi libavdevice/alsa-audio.h libavformat/gxf.c libswscale/swscale.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/x86/swscale_template.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_crop tests/ref/lavfi/pixfmts_hflip tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <[email protected]>
| * segafilm: add support for videos with cri adx adpcmMatthew Hoops2011-07-091-7/+21
| | | | | | | | Signed-off-by: Ronald S. Bultje <[email protected]>
| * gxf: Fix 25 fps DV material in GXF being misdetected as 50 fpsTomas Härdin2011-07-091-9/+16
| | | | | | | | | | | | | | | | Set DV packet durations using fields_per_frame. This requires turning gxf_stream_info into the demuxer's context for access to the value in gxf_packet(). Since MPEG-2 seems to work fine this done only for DV. Signed-off-by: Anton Khirnov <[email protected]>
* | Support gsm_ms in caf files.Carl Eugen Hoyos2011-07-092-0/+3
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-097-23/+88
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (28 commits) mp3enc: write a xing frame containing number of frames in the file lavf: update AVStream.nb_frames when muxing. ffmpeg: remove unused variables from InputStream. doc: update ffmpeg -ar and -ac documentation to reflect reality. ffmpeg: remove pointless if (nb_input_files) ffmpeg: merge input_files_ts_offset into input_files. ffmpeg: merge input_codecs into input_streams. ffmpeg: drop AV prefixes from struct names. ffmpeg: deprecate loop_input and loop_output options gif: add loop private option. img2: add loop private option. AVOptions: in av_opt_find() don't return named constants unless unit is specified. x11grab: replace undocumented nomouse hackery with a private option. dict: extend documentation. lls: whitespace cosmetics docs: Use proper markup for a literal command line option docs: Remove a remark that isn't relevant any longer docs: Explain how to regenerate import libraries with MSVC tools docs: Mention that libraries for MSVC can be built with a cross compiler docs: Remove old docs that mention setting up a build environment with lib.exe ... Conflicts: doc/ffmpeg.texi doc/general.texi ffmpeg.c libavcodec/Makefile libavcodec/dnxhddata.c libavformat/mp3enc.c libavformat/utils.c libavutil/Makefile tests/copycooker.sh Merged-by: Michael Niedermayer <[email protected]>
| * mp3enc: write a xing frame containing number of frames in the fileAnton Khirnov2011-07-081-5/+70
| |
| * lavf: update AVStream.nb_frames when muxing.Anton Khirnov2011-07-082-1/+8
| |
| * gif: add loop private option.Anton Khirnov2011-07-083-4/+34
| | | | | | | | Deprecate AVFormatContext.loop_output.