summaryrefslogtreecommitdiff
path: root/libavformat/img2.c
Commit message (Collapse)AuthorAge
* Add Kamil Nowosads j2k code.Kamil Nowosad2011-05-24
| | | | This needs work but it should not rot in soc svn.
* Add *.j2k extension to JPEG2000 decoderami_stuff2011-05-02
| | | | | | | | Some files with *.j2k extension can be found for example here: http://www.openjpeg.org/index.php?menu=samples Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* img2: return AVERROR(EINVAL) in case of invalid filename patternStefano Sabatini2011-04-21
| | | | | | | | | | In write_packet(), return AVERROR(EINVAL) rather than AVERROR(EIO) if the provided output filename pattern is not valid. Indeed this has to be considered a configuration error rather than an I/O error. Allow a less confusing error report. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* Merge remote branch 'qatar/master'Michael Niedermayer2011-04-20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * prefer avio_check() over url_exist()Stefano Sabatini2011-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem with url_exist() is that it tries to open a resource in RDONLY mode. If the file is a FIFO and there is already a reading client, the open() call will hang. By using avio_check() with access mode of 0, the second reading process will check if the file exists without attempting to open it, thus avoiding the lock. Fix issue #1663. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbolsStefano Sabatini2011-04-19
| | | | | | | | | | | | | | | | Make AVIO_FLAG_ access constants work as flags, and in particular fix the behavior of functions (such as avio_check()) which expect them to be flags rather than modes. This breaks API.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: bump minor and add an APIChanges entry for avformat cleanup lavf: get rid of ffm-specific stuff in avformat.h Not pulled: avio: deprecate av_protocol_next(). avio: add a function for iterating though protocol names. lavf: rename a parameter of av_sdp_create from buff->buf lavf: rename avf_sdp_create to av_sdp_create. lavf: make av_guess_image2_codec internal avio: make URLProtocol internal. avio: make URLContext internal. lavf: mark av_pkt_dump(_log) for remove on $next+1 bump. lavf: use designated initializers for all protocols applehttp: don't use deprecated url_ functions. avio: move two ff_udp_* functions from avio_internal to url.h asfdec: remove a forgotten declaration of nonexistent function avio: deprecate the typedef for URLInterruptCB Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: make av_guess_image2_codec internalAnton Khirnov2011-04-08
| | | | | | | | It doesn't look very useful as a public function.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: proto: include os_support.h in network.h matroskaenc: don't write an empty Cues element. lavc: add a FF_API_REQUEST_CHANNELS deprecation macro avio: move extern url_interrupt_cb declaration from avio.h to url.h avio: make av_register_protocol2 internal. avio: avio_ prefix for url_set_interrupt_cb. avio: AVIO_ prefixes for URL_ open flags. proto: introduce listen option in tcp doc: clarify configure features proto: factor ff_network_wait_fd and use it on udp Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: AVIO_ prefixes for URL_ open flags.Anton Khirnov2011-04-07
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Add .dpx to the list of supported file extensions for the image2 muxerPeter Ross2011-04-01
| |
* | make image2 muxer/demuxer support sequence of individual rawvideo filesPeter Ross2011-03-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2: stop using CODEC_ID_RAWVIDEO to trigger processing of independant ↵Peter Ross2011-03-31
| | | | | | | | | | | | | | | | 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 <michaelni@gmx.at>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-17
|\| | | | | | | | | | | | | | | | | | | Conflicts: Changelog doc/APIchanges doc/optimization.txt libavformat/avio.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: rename put_flush_packet -> avio_flushAnton Khirnov2011-03-16
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_feofAnton Khirnov2011-03-07
| | | | | | | | | | | | AVIOContext.eof_reached should be used directly instead. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefix for url_fsizeAnton Khirnov2011-03-07
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lavf: use a new ffio_wfourcc macro instead of put_tag() where possibleAnton Khirnov2011-02-25
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: rename url_fopen/fclose -> avio_open/close.Anton Khirnov2011-02-23
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio: avio_ prefixes for put_* functionsAnton Khirnov2011-02-21
| | | | | | | | | | | | | | | | | | | | | | | | In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Make the image2 demuxer log more verboseStefano Sabatini2011-01-28
| | | | | | | | | | | | | | Add an error message in case the user requests to write more than one file and the path does not contain a "%d" or "%0Nd" pattern. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
| * Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-26
| | | | | | | | | | 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: avio_ prefix for url_fsizeAnton Khirnov2011-03-08
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 76aa876e69cf78a40821e66dec0a1006e4eb23ec)
* | lavf: use a new ffio_wfourcc macro instead of put_tag() where possibleAnton Khirnov2011-02-26
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 0abdb2931719d96dee725e555e9b46b2b2f8a6be)
* | avio: rename url_fopen/fclose -> avio_open/close.Anton Khirnov2011-02-23
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 22a3212e32b696028e21f00871f3cb48c044029d)
* | avio: avio: avio_ prefixes for put_* functionsAnton Khirnov2011-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 77eb5504d3b3e1047900382350e0bc5e0bfb16b5)
* | avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
* | Make the image2 demuxer log more verboseStefano Sabatini2011-01-30
| | | | | | | | | | | | | | | | Add an error message in case the user requests to write more than one file and the path does not contain a "%d" or "%0Nd" pattern. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit 4fc9ff0ad6f0f6b2c7443c6b4a3a1c817e97fdfd)
* | Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-28
|/ | | | | | 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)
* cosmetics: align fields, and remove useless ones, in img2.cPascal Massimino2010-10-21
| | | | Originally committed as revision 25539 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cleanup image2pipe_{de}muxer fieldsPascal Massimino2010-10-21
| | | | Originally committed as revision 25531 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Associate .tga with format image2.Carl Eugen Hoyos2010-07-07
| | | | Originally committed as revision 24079 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add Pictor/PC Paint to image2 muxer/demuxerPeter Ross2010-06-08
| | | | Originally committed as revision 23533 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.Jean-Daniel Dupas2010-03-31
| | | | | | Patch by Jean-Daniel Dupas, devlists shadowlab org Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-30
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Dont senselessly fail on rawvideo that isnt 3 files per frame.Michael Niedermayer2010-03-22
| | | | Originally committed as revision 22637 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add flag so muxers not needing width/height can signal this.Michael Niedermayer2010-02-12
| | | | | | Add this flag to img2 (fixes -vcodec copy to image2 in some cases) Originally committed as revision 21773 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Avoid using deprecated AVFormatParameters::[audio|video]_codec_id field.Jai Menon2010-01-28
| | | | Originally committed as revision 21511 to svn://svn.ffmpeg.org/ffmpeg/trunk
* print error message when image2 muxer fail to compute frame filenameBaptiste Coudurier2009-12-01
| | | | Originally committed as revision 20694 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fixes detection and error reporting of non-existing files in img2.c.Samuli Valo2009-10-22
| | | | | | Patch by Samuli Valo: name surname picturall com Originally committed as revision 20346 to svn://svn.ffmpeg.org/ffmpeg/trunk
* return EOF in image2 demuxerBaptiste Coudurier2009-07-30
| | | | Originally committed as revision 19538 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Revert unintended hunk of r19241.Carl Eugen Hoyos2009-06-20
| | | | Originally committed as revision 19242 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Revert r19239: It broke four conformance tests.Carl Eugen Hoyos2009-06-20
| | | | Originally committed as revision 19241 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Print meaningful error messages when url_fopen fails.Jai Menon2009-06-20
| | | | Originally committed as revision 19230 to svn://svn.ffmpeg.org/ffmpeg/trunk
* DPX (Digital Picture Exchange) image decoderJimmy Christensen2009-06-12
| | | | | | patch by Jimmy Christensen, jimmy ghost dk Originally committed as revision 19163 to svn://svn.ffmpeg.org/ffmpeg/trunk
* PCX encoder that handles 1-, 8-, and 24-bpp pixfmts.Daniel Verkamp2009-03-20
| | | | | | Patch by Daniel Verkamp, daniel drv nu Originally committed as revision 18077 to svn://svn.ffmpeg.org/ffmpeg/trunk