summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-04-013-2/+68
|\ | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: mpegts: propagate avio EOF in read_packet() configure: Initial support for --target-os=symbian Fixed-point FFT and MDCT Include dependencies for test programs ac3enc: simplify sym_quant() flvdec: read index stored in the 'keyframes' tag. mov: Add support for zero-sized stsc runs. Merged-by: Michael Niedermayer <[email protected]>
| * mpegts: propagate avio EOF in read_packet()Jindrich Makovicka2011-03-311-1/+1
| | | | | | | | | | | | | | Allows distinguishing between EOF and IO error in read_packet return code. Signed-off-by: Jindrich Makovicka <[email protected]> Signed-off-by: Anton Khirnov <[email protected]>
| * flvdec: read index stored in the 'keyframes' tag.Kharkov Alexander2011-03-311-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'keyframes' metatag is not part of the standard, it is just convention to use such kind of metatag information for indexing. Structure is following, it allows to have it inconsistent: keyframes: times (array): time0 (num) time1 (num) time2 (num) filepositions (array) position0 (num) position1 (num) Signed-off-by: Anton Khirnov <[email protected]>
| * mov: Add support for zero-sized stsc runs.Alex Converse2011-03-311-1/+1
| | | | | | | | | | | | | | A zero sized stsc run doesn't make a lot of sense but the spec does not prohibit them and MPlayer VLC demuxers support them. Signed-off-by: Anton Khirnov <[email protected]>
* | make image2 muxer/demuxer support sequence of individual rawvideo filesPeter Ross2011-03-311-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | img2: stop using CODEC_ID_RAWVIDEO to trigger processing of independant ↵Peter Ross2011-03-311-3/+9
| | | | | | | | | | | | | | | | y/u/v image files This is requireed, as img2 will be modified soon to support .raw image file sequences. Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-317-27/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: rtsp: Use GET_PARAMETER for keep-alive for generic RTSP servers mlp_parse.c: set AVCodecContext channel_layout APIChanges: mark the place where 0.6 was branched. avio: make get_checksum() internal. avio: move ff_crc04C11DB7_update() from avio.h -> avio_internal.h avio: make init_checksum() internal. NOT MERGED Add MxPEG decoder NOT MERGED Add support for picture_ptr field in MJpegDecodeContext NOT MERGED Move MJPEG's input buffer preprocessing in separate public function NOT MERGED Support reference picture defined by bitmask in MJPEG's SOS decoder sndio bug fix Merged-by: Michael Niedermayer <[email protected]>
| * rtsp: Use GET_PARAMETER for keep-alive for generic RTSP serversMartin Storsjö2011-03-301-1/+1
| | | | | | | | | | | | | | | | | | According to the RFC, GET_PARAMETER should be used for this, and according to a report from Tim Ouellette, OPTIONS doesn't work for keeping the connection alive for some servers. Also, live555 uses GET_PARAMETER for this purpose. Signed-off-by: Luca Barbato <[email protected]>
| * avio: make get_checksum() internal.Anton Khirnov2011-03-306-14/+18
| |
| * avio: move ff_crc04C11DB7_update() from avio.h -> avio_internal.hAnton Khirnov2011-03-302-2/+2
| |
| * avio: make init_checksum() internal.Anton Khirnov2011-03-306-10/+21
| |
| * id3v1: change filesize to int64_t.Carl Eugen Hoyos2011-03-281-2/+2
| | | | | | | | Signed-off-by: Ronald S. Bultje <[email protected]>
| * id3v1: Seek back to old position after reading.Carl Eugen Hoyos2011-03-281-1/+2
| | | | | | | | | | | | | | | | FFmpeg did not seek back to the original position, but to "0", making reading a VBR tag impossible. (issue 2645) Signed-off-by: Ronald S. Bultje <[email protected]>
* | In ipod/mov/mp4 muxer, always write esds descriptor length using 4 bytes,Baptiste Coudurier2011-03-301-11/+3
| | | | | | | | ipod shuffle doesn't support anything else.
* | In mov muxer, fix yuv range in avid atoms used by dnxhd.Baptiste Coudurier2011-03-301-1/+1
| |
* | Merge remote-tracking branch 'ffmpeg-mt/master'Michael Niedermayer2011-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-295-8/+129
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * Chronomaster DFA decoderKostya Shishkov2011-03-284-1/+122
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
| * http: header field names are case insensitiveTyler2011-03-281-7/+7
| | | | | | | | | | | | | | | | | | 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 <[email protected]>
* | Use strtoul to parse rtptime and seq values.Ilya2011-03-261-2/+2
| | | | | | | | | | 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-261-3/+3
| |
* | nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BEPeter Ross2011-03-261-0/+2
| |
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-262-1/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.Justin Ruggles2011-03-251-1/+5
| |
| * Use audio_service_type to set stream disposition.Justin Ruggles2011-03-251-0/+13
| |
* | Revert "matroskadec: set default duration for simple block"Michael Niedermayer2011-03-251-2/+0
| | | | | | | | | | This reverts commit 98a7d560b4f835ba5b99b9974ee1a2c096198bea. This has been implemented differently by aurel already
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-252-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * matroskadec: set default duration for simple blockJohn Stebbins2011-03-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]>
| * ffmetadec.c: fix compiler warnings.Ronald S. Bultje2011-03-241-2/+2
| |
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-248-44/+31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * avio: make udp_set_remote_url/get_local_port internal.Anton Khirnov2011-03-234-11/+17
| |
| * asfdec: also subtract preroll when reading simple index objectVladimir Pantelic2011-03-231-2/+2
| | | | | | | | | | | | | | This was missed when ASF was changed to return timestamps without preroll. Signed-off-by: Mans Rullgard <[email protected]>
| * matroskaenc: remove a variable that's unused after bc17bd9.Anton Khirnov2011-03-231-1/+0
| | | | | | | | Signed-off-by: Ronald S. Bultje <[email protected]>
| * avio: cosmetics - nicer vertical alignment.Anton Khirnov2011-03-232-2/+2
| | | | | | | | Signed-off-by: Mans Rullgard <[email protected]>
| * rtsp: Don't use a locale dependent format stringMartin Storsjö2011-03-231-2/+1
| | | | | | | | | | | | | | In this particular case, we aren't ever printing anything else than 0.000 anyway. Signed-off-by: Ronald S. Bultje <[email protected]>
| * Add xd55 codec tag for XDCAM HD422 720p25 CBR files.Tomas Härdin2011-03-231-0/+1
| | | | | | | | Signed-off-by: Ronald S. Bultje <[email protected]>
| * matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_configAnton Khirnov2011-03-221-18/+5
| | | | | | | | | | | | | | This also fixes broken SBR detection, which produced files with double sample rate since 8ae0fa2. Signed-off-by: Ronald S. Bultje <[email protected]>
| * Do not use format string "%0.3f" for RTSP Range field.Carl Eugen Hoyos2011-03-221-2/+3
| | | | | | | | | | | | The format string was locale-depending. Signed-off-by: Ronald S. Bultje <[email protected]>
* | matroskaenc: make sure we don't produce invalid file with no codec IDAurelien Jacobs2011-03-241-0/+4
| | | | | | | | Signed-off-by: Aurelien Jacobs <[email protected]>
* | matroskaenc: add missing new line in av_log() callAurelien Jacobs2011-03-241-1/+1
| | | | | | | | Signed-off-by: Aurelien Jacobs <[email protected]>
* | matroskadec: check that pointers were initialized before accessing themAurelien Jacobs2011-03-241-3/+5
| | | | | | | | | | | | fix ticket #14 Signed-off-by: Aurelien Jacobs <[email protected]>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-2313-32/+51
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * id3v2: skip broken tags with invalid sizeAnton Khirnov2011-03-221-4/+4
| | | | | | | | fixes issue2649.
| * id3v2: don't explicitly skip paddingAnton Khirnov2011-03-221-4/+0
| | | | | | | | It's pointless, since there's a seek to the end of tag later.
| * amr: Set the AVFMT_GENERIC_INDEX flagMartin Storsjö2011-03-211-0/+1
| | | | | | | | | | 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-211-1/+2
| | | | | | | | | | 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-211-0/+3
| | | | | | | | | | | | | | | | 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-211-1/+1
| | | | | | | | | | | | | | | | | | | | 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 <[email protected]>
| * applehttp: Change the variable for stream position in seconds into int64_tMartin Storsjö2011-03-211-1/+2
| | | | | | | | | | | | | | | | 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 <[email protected]>
| * id3v2: simplify error handling.Anton Khirnov2011-03-211-6/+4
| | | | | | | | Signed-off-by: Ronald S. Bultje <[email protected]>