summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'ffmpeg-mt/master'Michael Niedermayer2011-03-30
| | | | | | | | | | | | | | | * ffmpeg-mt/master: Update todo. More items appeared... Fix mdec Duplicate: id3v1: change filesize to int64_t. Duplicate: id3v1: Seek back to old position after reading. Conflicts: libavcodec/mpegvideo.c libavcodec/snow.c libavformat/id3v1.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-29
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: ac3enc: avoid memcpy() of exponents and baps in EXP_REUSE case by using exponent reference blocks. Chronomaster DFA decoder DUPLICATE: framebuffer device demuxer NOT MERGED: cosmetics: fix dashed line length after 070c5d0 http: header field names are case insensitive Conflicts: LICENSE README doc/indevs.texi libavdevice/fbdev.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Chronomaster DFA decoderKostya Shishkov2011-03-28
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * http: header field names are case insensitiveTyler2011-03-28
| | | | | | | | | | | | | | | | | | Amazon S3 sends header field names all lowercase. This is actually acceptable according to the HTTP standard. http://tools.ietf.org/html/rfc2616#section-4.2 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Use strtoul to parse rtptime and seq values.Ilya2011-03-26
| | | | | | | | | | strtol could return negative values, leading to various error messages, mainly "non-monotonically increasing dts".
* | lavf: make compute_pkt_fields2() return meaningful error valuesStefano Sabatini2011-03-26
| |
* | nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BEPeter Ross2011-03-26
| |
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom. Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder. Use audio_service_type to set stream disposition. Add APIchanges entry for audio_service_type. Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream. configure: in check_ld, place new -l flags before existing ones support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl doc: update build system documentation aacenc: indentation aacenc: fix the side calculation in search_for_ms vp8.c: rename EDGE_* to VP8_EDGE_*. Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h libavcodec/vp8.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.Justin Ruggles2011-03-25
| |
| * Use audio_service_type to set stream disposition.Justin Ruggles2011-03-25
| |
* | Revert "matroskadec: set default duration for simple block"Michael Niedermayer2011-03-25
| | | | | | | | | | This reverts commit 98a7d560b4f835ba5b99b9974ee1a2c096198bea. This has been implemented differently by aurel already
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: matroskadec: set default duration for simple block When building for MinGW32 disable strict ANSI compliancy. ARM: fix ff_apply_window_int16_neon() prototype configure: check for --as-needed support early ARM: NEON optimised apply_window_int16() ac3enc: NEON optimised shift functions ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min mpeg12.c: fix slice threading for mpeg2 field picture mode. ffmetadec.c: fix compiler warnings. configure: Don't explicitly disable ffplay or in/outdevices on dos configure: Remove the explicit disabling of ffserver configure: Add fork as a dependency to ffserver Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: set default duration for simple blockJohn Stebbins2011-03-25
| | | | | | | | | | | | | | | | | | | | | | When a normal Block is parsed, duration is initialized to AV_NOPTS_VALUE. If it is not changed, then the track's default duration is used. But for SimpleBlock, duration is initialized to 0 instead of AV_NOPTS_VALUE. This is due to the difference in how EBML_NEST vs EBML_PASS are processed. Setting duration to 0 leads eventually to wrongly estimate the frame duration in util.c Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * ffmetadec.c: fix compiler warnings.Ronald S. Bultje2011-03-24
| |
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: avio: make udp_set_remote_url/get_local_port internal. asfdec: also subtract preroll when reading simple index object matroskaenc: remove a variable that's unused after bc17bd9. avio: cosmetics - nicer vertical alignment. Remove unnecessary icc version checks Disable 'attribute "foo" ignored' warnings from icc rtsp: Don't use a locale dependent format string Add xd55 codec tag for XDCAM HD422 720p25 CBR files. configure: get libavcodec version from new version.h header lavc: move the version macros to a new installed header. matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config Do not use format string "%0.3f" for RTSP Range field. Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder. Document usage of import libraries created by dlltool configure: Set the correct lib target for arm/wince dlltool fate: simplify regression-funcs.sh fate: add support for multithread testing Conflicts: libavformat/rtspdec.c libavutil/attributes.h libavutil/internal.h libavutil/mem.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: make udp_set_remote_url/get_local_port internal.Anton Khirnov2011-03-23
| |
| * asfdec: also subtract preroll when reading simple index objectVladimir Pantelic2011-03-23
| | | | | | | | | | | | | | This was missed when ASF was changed to return timestamps without preroll. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * matroskaenc: remove a variable that's unused after bc17bd9.Anton Khirnov2011-03-23
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: cosmetics - nicer vertical alignment.Anton Khirnov2011-03-23
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * rtsp: Don't use a locale dependent format stringMartin Storsjö2011-03-23
| | | | | | | | | | | | | | In this particular case, we aren't ever printing anything else than 0.000 anyway. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Add xd55 codec tag for XDCAM HD422 720p25 CBR files.Tomas Härdin2011-03-23
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_configAnton Khirnov2011-03-22
| | | | | | | | | | | | | | This also fixes broken SBR detection, which produced files with double sample rate since 8ae0fa2. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Do not use format string "%0.3f" for RTSP Range field.Carl Eugen Hoyos2011-03-22
| | | | | | | | | | | | The format string was locale-depending. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | matroskaenc: make sure we don't produce invalid file with no codec IDAurelien Jacobs2011-03-24
| | | | | | | | Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
* | matroskaenc: add missing new line in av_log() callAurelien Jacobs2011-03-24
| | | | | | | | Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
* | matroskadec: check that pointers were initialized before accessing themAurelien Jacobs2011-03-24
| | | | | | | | | | | | fix ticket #14 Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: (33 commits) Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size. Add kbdwin.o to AC3 decoder Detect byte-swapped AC-3 and support decoding it directly. cosmetics: indentation Always copy input data for AC3 decoder. ac3enc: make sym_quant() branch-free cosmetics: indentation Add a CPU flag for the Atom processor. id3v2: skip broken tags with invalid size id3v2: don't explicitly skip padding Make sure kbhit() is in conio.h fate: update wmv8-drm reference vc1: make P-frame deblock filter bit-exact. configure: Add the -D parameter to the dlltool command amr: Set the AVFMT_GENERIC_INDEX flag amr: Set the pkt->pos field properly to the start of the packet amr: Set the codec->bit_rate field based on the last packet rtsp: Specify unicast for TCP interleaved streams, too Set the correct target for mingw64 dlltool applehttp: Change the variable for stream position in seconds into int64_t ... Conflicts: ffmpeg.c ffplay.c libavcodec/ac3dec.c libavformat/avio.h libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * id3v2: skip broken tags with invalid sizeAnton Khirnov2011-03-22
| | | | | | | | fixes issue2649.
| * id3v2: don't explicitly skip paddingAnton Khirnov2011-03-22
| | | | | | | | It's pointless, since there's a seek to the end of tag later.
| * amr: Set the AVFMT_GENERIC_INDEX flagMartin Storsjö2011-03-21
| | | | | | | | | | This makes the amr demuxer support seeking, closing roundup issue 2593.
| * amr: Set the pkt->pos field properly to the start of the packetMartin Storsjö2011-03-21
| | | | | | | | | | Previously, the field pointed to the second byte of the packet (which is the first byte of the actual AMR payload).
| * amr: Set the codec->bit_rate field based on the last packetMartin Storsjö2011-03-21
| | | | | | | | | | | | | | | | This allows libavformat to guess an estimated duration for amr files. For streams with varying bit rates (or with silence descriptors or "no frame" blocks) the guess is, of course, inaccurate.
| * rtsp: Specify unicast for TCP interleaved streams, tooMartin Storsjö2011-03-21
| | | | | | | | | | | | | | | | | | | | According to the RFC, the default is multicast if nothing is specified, which doesn't make sense for TCP. According to a bug report, some Axis camera models give a "400 Bad Request" error if this is omitted. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * applehttp: Change the variable for stream position in seconds into int64_tMartin Storsjö2011-03-21
| | | | | | | | | | | | | | | | A similar variable for the total stream duration was changed to int64_t in b79c3df08807c96a945, due to overflows in some odd streams. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * id3v2: simplify error handling.Anton Khirnov2011-03-21
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * id3v2: explicitly seek to the end of the tag after readingAnton Khirnov2011-03-21
| | | | | | | | | | | | | | | | Current code might stop in the middle of an invalid tag. fixes issue2650 Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: make av_url_read_fseek/fpause internal.Anton Khirnov2011-03-21
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_filenoAnton Khirnov2011-03-20
| | | | | | | | | | | | | | | | It's an evil hack that assumes an AVIOContext is always based on top of an URLContext. It's also not used anywhere. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * rmenc: replace avio_seek(0) with avio_tell()Anton Khirnov2011-03-20
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lavf: replace some more avio_seek(SEEK_CUR) with avio_skipAnton Khirnov2011-03-20
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Do not use format string "%0.3f" for RTSP Range field.Carl Eugen Hoyos2011-03-22
| | | | | | | | | | Fixes ticket 10. The format string was locale-depending.
* | Add xd55 codec tag for XDCAM HD422 720p25 CBR files.Tomas Härdin2011-03-21
| |
* | Allow demuxing of APE files with metadata tags.Carl Eugen Hoyos2011-03-21
| | | | | | | | Fixes ticket 11.
* | reverts parts of commit de11ee906ed232157392924735c18ab7d8522ccb. The author ↵Michael Niedermayer2011-03-18
| | | | | | | | of this patch has a poor understanding of the code
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-18
|\| | | | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nutenc: fix a memleakAnton Khirnov2011-03-17
| | | | | | | | | | | | This fixes a minor memory leak introduced in 073f8b1. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * asfdec: subtract the preroll value and thus output 0 based timestampsVladimir Pantelic2011-03-17
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | lavf: fix function name in compute_pkt_fields2 av_dlog messageStefano Sabatini2011-03-18
| |
* | Revert "jvdec: don't use deprecated url_feof()"Michael Niedermayer2011-03-17
| | | | | | | | This reverts commit 1dac4d554734b16757b36a0adc71642c5ef2c4e6.