summaryrefslogtreecommitdiffstats
path: root/libavformat/wtv.c
Commit message (Collapse)AuthorAgeFilesLines
* WTV muxer (1_extract_wtv_common_code.patch)zhentan feng2011-09-081-0/+31
|
* WTV: Add ff_ prefix to the moved fields.zhentan feng2011-05-011-9/+9
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* WTV:move the common variable used by wtvdec.c and wtvenc.c to a new file ↵zhentan feng2011-05-011-0/+45
| | | | | | wtv.h and wtv.c. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* rename wtv.c to wtvdec.czhentan feng2011-05-011-1079/+0
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864'Michael Niedermayer2011-04-151-1/+3
|\ | | | | | | | | | | | | | | | | | | | | * commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864': avutil: make aes and sha api public handle malloc failures in ff_get_wav_header add xWMA demuxer mpegts: force the default timebase libavcodec: Bump micro after adding the dtx AVOptions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * handle malloc failures in ff_get_wav_headerMax Horn2011-04-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | ff_get_wav_header is reading data from a WAVE file and then uses it (without validation) to malloc a buffer. It then proceeded to read data into the buffer, without verifying that the allocation succeeded. To address this, change ff_get_wav_header to return an error if allocation failed, and adapted all calling code to handle that error. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | move PRI_GUID, ARG_GUID, AVCodecGuid, ff_codec_guid_get_id, ↵Peter Ross2011-04-071-50/+20
| | | | | | | | | | | | MEDIASUBTYPE_BASE_GUID and audio_guids[] to riff.c/h (add FF_ prefix to PRI_GUID, ARG_GUID, and MEDIASUBTYPE_BASE_GUID; rename audio_guids to ff_codec_wav_guids) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-071-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix parser: mark av_parser_parse() for removal on next major bump swscale: postpone sws_getContext removal until next major bump. fate: add AAC LATM test mmst: get rid of deprecated AVERRORs lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM. Reemove remaining uses of deprecated AVERROR_NOTSUPP. REIMPLEMENTED in 2 lines of code: lavf: if id3v2 tag is present and all else fails, guess by file extension Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Reemove remaining uses of deprecated AVERROR_NOTSUPP.Anton Khirnov2011-04-061-1/+1
| |
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-231-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavf: replace some more avio_seek(SEEK_CUR) with avio_skipAnton Khirnov2011-03-201-2/+2
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-171-27/+27
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: Changelog doc/APIchanges doc/optimization.txt libavformat/avio.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes senseAnton Khirnov2011-03-161-27/+27
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-151-1/+1
|\ \ | |/ | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: deprecate url_ferrorAnton Khirnov2011-03-151-1/+1
| | | | | | | | | | | | AVIOContext.error should be used directly instead. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_feofAnton Khirnov2011-03-071-5/+5
| | | | | | | | | | | | AVIOContext.eof_reached should be used directly instead. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-041-2/+2
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lavf: replace all uses of url_fskip with avio_seekAnton Khirnov2011-03-011-29/+29
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefix for url_fseekAnton Khirnov2011-03-011-13/+13
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-211-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In the name of consistency: get_byte -> avio_r8 get_<type> -> avio_r<type> get_buffer -> avio_read get_partial_buffer will be made private later get_strz is left out becase I want to change it later to return something useful. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: rename av_alloc_put_byte -> avio_alloc_context for consistencyAnton Khirnov2011-02-211-1/+1
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-201-18/+18
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * wtv: ignore empty data_guid chunksPeter Ross2011-02-131-1/+1
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * wtv: mark streams intended for hearing or visual impaired personsPeter Ross2011-02-101-1/+18
| | | | | | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
| * reindent after last commitPeter Ross2011-02-051-8/+8
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * wtv: do not use flag in stream_guid chunk to determine if stream is valid, ↵Peter Ross2011-02-051-6/+2
| | | | | | | | | | | | | | | | as this method is unreliable This fixes roundup issue 2556. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * add ff_index_search_timestamp and ff_add_index_entryPeter Ross2011-02-031-0/+1
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * wtv: filesystem implementationPeter Ross2011-02-031-78/+564
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-261-1/+1
| | | | | | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
* | avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-051-2/+2
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit a2704c9712ad35cc22e7e0d8a79b581c07fa383b)
* | lavf: replace all uses of url_fskip with avio_seekAnton Khirnov2011-03-031-29/+29
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit e356fc57a2e9887370caec58d8aafeafd1f336dc)
* | avio: avio_ prefix for url_fseekAnton Khirnov2011-03-031-13/+13
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 6b4aa5dac8f41aa452d0ce9a1bede9e59a303060)
* | avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-221-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the name of consistency: get_byte -> avio_r8 get_<type> -> avio_r<type> get_buffer -> avio_read get_partial_buffer will be made private later get_strz is left out becase I want to change it later to return something useful. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit b7effd4e8338f6ed5bda630ad7ed0809bf458648)
* | avio: rename av_alloc_put_byte -> avio_alloc_context for consistencyAnton Khirnov2011-02-221-1/+1
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 8d9ac969cb4ac3e3e18f6425703af4d7aec6c513)
* | avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-201-18/+18
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
* | wtv: ignore empty data_guid chunksPeter Ross2011-02-141-1/+1
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 1a973feb45826a1998b4286ecfe1fa7a602b8780)
* | wtv: mark streams intended for hearing or visual impaired personsPeter Ross2011-02-111-1/+18
| | | | | | | | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit 68137ba386933243a84fc65f0deb3ad0ce5ff0ea)
* | reindent after last commitPeter Ross2011-02-061-8/+8
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 74571e333cc9abf3fe3fde3735698def1547db71)
* | wtv: do not use flag in stream_guid chunk to determine if stream is valid, ↵Peter Ross2011-02-061-6/+2
| | | | | | | | | | | | | | | | | | as this method is unreliable This fixes roundup issue 2556. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit e4f85b849913794395bb03dfc09546cd41b10882)
* | add ff_index_search_timestamp and ff_add_index_entryPeter Ross2011-02-061-0/+1
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit e6fb5a4f78a67ed815e39ba8ac3893fd631b9b1a)
* | wtv: filesystem implementationPeter Ross2011-02-061-78/+564
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit f61dee2fe4bc6a614079f37c25af1f92e90bc35b)
* | Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-281-1/+1
|/ | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts. (cherry picked from commit c6610a216ed2948885772154a2eed696e0cb4aca)
* wtv: ignore VIDEOINFOHEADER2 picture aspect ratio information, as it is ↵Peter Ross2011-01-141-6/+1
| | | | | | unreliable Originally committed as revision 26327 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix indentationPeter Ross2011-01-091-9/+9
| | | | Originally committed as revision 26278 to svn://svn.ffmpeg.org/ffmpeg/trunk
* wtv: only process timestamp_guid chunks for streams that we know aboutPeter Ross2011-01-091-0/+3
| | | | Originally committed as revision 26277 to svn://svn.ffmpeg.org/ffmpeg/trunk
* wtv: do not repopulate codec information after we have seen data chunksPeter Ross2011-01-091-1/+11
| | | | Originally committed as revision 26276 to svn://svn.ffmpeg.org/ffmpeg/trunk
* wtv: stop processing chunks if length is smaller than chunk headerPeter Ross2011-01-091-0/+2
| | | | Originally committed as revision 26275 to svn://svn.ffmpeg.org/ffmpeg/trunk
* wtv: fix typoPeter Ross2011-01-091-1/+1
| | | | Originally committed as revision 26274 to svn://svn.ffmpeg.org/ffmpeg/trunk
* wtv: obtain codec information from stream2_guid chunks, if presentPeter Ross2011-01-041-15/+42
| | | | Originally committed as revision 26208 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud