summaryrefslogtreecommitdiffstats
path: root/libavcodec/utils.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'qatar/master'Michael Niedermayer2011-04-171-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ac3dec: fix processing of delta bit allocation information. vc1: fix fate-vc1 after previous commit. wmv3dec: fix playback of complex WMV3 files using simple_idct. make av_dup_packet() more cautious on allocation failures make containers pass palette change in AVPacket introduce side information for AVPacket Politic commits that have not been pulled: Update regtest checksums after revision 6001dad. Replace more FFmpeg references by Libav. Replace references to ffmpeg-devel with libav-devel; fix roundup URL. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace more FFmpeg references by Libav.Diego Biurrun2011-04-171-1/+1
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-121-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Not pulled due to wrong author, according to carl: Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX(). Fix compilation of timefilter test program. Add support for AMR-WB encoding via libvo-amrwbenc Add an AAC encoder by using the libvo-aacenc library g722: Return 8 bits per sample for g722 in av_get_bits_per_sample Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g722: Return 8 bits per sample for g722 in av_get_bits_per_sampleMartin Storsjö2011-04-111-0/+1
| | | | | | | | | | | | | | | | This fixes a failing assert in ff_raw_read_header (in fate-g722dec-1), where bits_per_coded_sample is set using this function and is required to have a positive value. Signed-off-by: Martin Storsjö <martin@martin.st>
* | add avcodec_get_subtitle_defaults() to initialize AVSubtitle structAurelien Jacobs2011-04-111-0/+7
| | | | | | | | | | | | | | | | Call this new function before decode() to replace the custom and inconsistant initialization in various decoders. This function is equivalent to avcodec_get_frame_defaults() for AVFrame. Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
* | Add the notion of pixel size in h264 related functions.Oskar Arvidsson2011-04-101-1/+2
| | | | | | | | | | | | | | | | | | | | In high bit depth the pixels will not be stored in uint8_t like in the normal case, but in uint16_t. The pixel size is thus 1 in normal bit depth and 2 in high bit depth. Preparatory patch for high bit depth h264 decoding support. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add pixel formats for 9- and 10-bit yuv420p.Oskar Arvidsson2011-04-101-0/+4
| | | | | | | | | | | | | | | | Also add support for these formats in libswscale. Needed for high bit depth h264 decoding. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-061-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: psymodel: extend API to include PE and bit allocation. avio: always compile dyn_buf functions Remove unnecessary parameter from ff_thread_init() and fix behavior Revert "aac_latm_dec: use aac context and aac m4ac" configure: tell user if libva is enabled like the rest of external libs. Add silence support for AV_SAMPLE_FMT_U8. avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal avio: deprecate av_url_read_seek avio: deprecate av_url_read_pause ac3enc: NEON optimised extract_exponents Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove unnecessary parameter from ff_thread_init() and fix behaviorAlexander Strange2011-04-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | thread_count passed to ff_thread_init() is only used to set AVCodecContext. thread_count, and can be removed. Instead move it to the legacy implementation of avcodec_thread_init(). This also fixes the problem that calling avcodec_thread_init() with pthreads enabled did not set it since ff1efc524cb3c60f2f746e3b4550bb1a86c65316. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Unbreak avcodec_thread_initReimar Döffinger2011-03-281-4/+5
| | | | | | | | avcodec_thread_init currently doesn't do anything at all with pthreads enabled.
* | Fake-Merge remote-tracking branch 'ffmpeg-mt/master'Michael Niedermayer2011-03-221-3/+6
| |
* | Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"Michael Niedermayer2011-03-171-1/+1
| | | | | | | | This reverts commit 29ba091136a5e04574f7bfc1b17536c923958f6f.
* | Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*"Michael Niedermayer2011-03-171-1/+1
| | | | | | | | This reverts commit a03be6e1ba4cbf9984b0bbdb674704bbb2da6713.
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-171-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: Changelog doc/APIchanges doc/optimization.txt libavformat/avio.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*Janne Grunau2011-03-161-1/+1
| |
| * replace FFMPEG with LIBAV in FFMPEG_CONFIGURATIONJanne Grunau2011-03-161-1/+1
| | | | | | | | also update the multiple inclusion guards in config.h|mak
| * Update the url to the site website and change ffmpeg-devel to libav-develJohan Andersson2011-03-131-2/+2
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Merge libavcore into libavutilReinhard Tartler2011-02-151-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * Remove incorrect return statement from avcodec_thread_free()Mans Rullgard2011-02-101-1/+1
| | | | | | | | | | | | | | The function return type is void, so a return statement with an expression is forbidden (and pointless). Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Fix build with threading disabledMans Rullgard2011-02-091-0/+2
| | | | | | | | | | | | | | | | The avcodec_thread_free() compatibility wrapper calls ff_thread_free(), which is not defined when threading is disabled. Make this call conditional. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * check sample_fmt in avcodec_openReimar Döffinger2011-02-091-0/+10
| | | | | | | | | | | | check AVCodecContext->sample_fmt against AVCodec->sample_fmts[] to ensure that the encoder supports the specified sample format. Error out if it doesn't. Previously, it would continue and output garbage. Fixes issue 2587.
| * Deprecate avcodec_thread_init()Alexander Strange2011-02-091-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As a side effect of the last commit, avcodec_open() now calls it automatically, so there is no longer any need for clients to call it. Instead they should set AVCodecContext.thread_count. avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the next MAJOR libavcodec bump. Rename the functions to ff_thread_init/free, since they are now internal. Wrappers are provided to maintain API compatibility. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Frame-based multithreading framework using pthreadsAlexander Strange2011-02-091-6/+54
| | | | | | | | | | | | See doc/multithreading.txt for details on use in codecs. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Set pkt_pts in avcodec_default_reget_buffer()Nicolas George2011-02-031-0/+2
| | | | | | | | | | | | | | This was missed when pkt_pts was first added. Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Make the ff_lockmgr_cb function pointer static to utils.cDiego Elio Pettenò2011-01-241-1/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Move guess_correct_pts() under got_picture_ptr.Michael Niedermayer2011-03-041-4/+5
| |
* | Merge libavcore into libavutilReinhard Tartler2011-02-161-5/+4
| | | | | | | | Done to keep ABI compatible. Otherwise this is just silly
* | Remove incorrect return statement from avcodec_thread_free()Mans Rullgard2011-02-111-1/+1
| | | | | | | | | | | | | | | | The function return type is void, so a return statement with an expression is forbidden (and pointless). Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit b4668274b944abae61759e796c5cc36ade510f24)
* | Fix build with threading disabledMans Rullgard2011-02-111-0/+2
| | | | | | | | | | | | | | | | | | The avcodec_thread_free() compatibility wrapper calls ff_thread_free(), which is not defined when threading is disabled. Make this call conditional. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 9a77a92c2b6855781d2a4cfab14c67ae4025760c)
* | check sample_fmt in avcodec_openReimar Döffinger2011-02-111-0/+10
| | | | | | | | | | | | | | check AVCodecContext->sample_fmt against AVCodec->sample_fmts[] to ensure that the encoder supports the specified sample format. Error out if it doesn't. Previously, it would continue and output garbage. Fixes issue 2587. (cherry picked from commit 2cfa2d925808e6cc6fb7a7c133b7cb7622afd37e)
* | Deprecate avcodec_thread_init()Alexander Strange2011-02-111-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a side effect of the last commit, avcodec_open() now calls it automatically, so there is no longer any need for clients to call it. Instead they should set AVCodecContext.thread_count. avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the next MAJOR libavcodec bump. Rename the functions to ff_thread_init/free, since they are now internal. Wrappers are provided to maintain API compatibility. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit c0b102ca03fe92250f1ce620aec3836f529fc1d6)
* | Frame-based multithreading framework using pthreadsAlexander Strange2011-02-111-5/+54
| | | | | | | | | | | | See doc/multithreading.txt for details on use in codecs. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Implement guessed_pts in avcodec_decode_video2Nicolas George2011-02-071-1/+42
| | | | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Set pkt_pts in avcodec_default_reget_buffer()Nicolas George2011-02-041-0/+2
| | | | | | | | | | | | | | | | This was missed when pkt_pts was first added. Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 62ecd3635a1329c49bc3b97ba84ad4d53d847163)
* | Make the ff_lockmgr_cb function pointer static to utils.cDiego Elio Pettenò2011-01-261-1/+1
|/ | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit bb875b75bab4d1713f8251746b01785c19965a9f)
* update av_log_missing_feature() to gitJanne Grunau2011-01-171-1/+1
| | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* don't complain about codec type/id mismatche for attachment streamsAurelien Jacobs2011-01-121-1/+2
| | | | Originally committed as revision 26316 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Show profile in avcodec_string().Anssi Hannula2011-01-081-0/+8
| | | | | | Patch by Anssi Hannula, anssi d hannula a iki d fi Originally committed as revision 26264 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add pkt_dts to AVFrame, this will in the future allow multithreading decodersMichael Niedermayer2011-01-071-0/+2
| | | | | | to not mess up dts Originally committed as revision 26261 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add AVFrame.pkt_pts that contains the correctly reordered AVPacket.ptsMichael Niedermayer2011-01-071-0/+8
| | | | Originally committed as revision 26260 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add av_get_profile_name() to get profile names.Anssi Hannula2011-01-071-0/+13
| | | | | | Patch by Anssi Hannula, anssi d hannula a iki d fi Originally committed as revision 26259 to svn://svn.ffmpeg.org/ffmpeg/trunk
* free subtitle_header before overwriting it to avoid memleakAurelien Jacobs2010-12-311-0/+5
| | | | Originally committed as revision 26176 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix -lowres with ffplay.Anatoly Nenashev2010-12-191-1/+2
| | | | | | Patch by Anatoly Nenashev, anatoly d nenashev a ovsoft d ru Originally committed as revision 26057 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change the argument of memory allocation functions from unsigned int to size_tMichael Niedermayer2010-12-041-8/+11
| | | | | | with the next major bump in libavcodec. Originally committed as revision 25872 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use the new libavcore audio channel API.Stefano Sabatini2010-11-211-1/+2
| | | | | | | This also allows to remove a linking dependency of libavfilter on libavcodec. Originally committed as revision 25789 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enumStefano Sabatini2010-11-121-2/+2
| | | | | | SampleFormat with AVSampleFormat. Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move internal function ff_set_systematic_pal() to libavcore, andStefano Sabatini2010-11-091-1/+2
| | | | | | rename it ff_set_systematic_pal2(). Originally committed as revision 25712 to svn://svn.ffmpeg.org/ffmpeg/trunk
* H.264 decode: support cropping up to 28 pixels in interlaced mode.Reimar Döffinger2010-11-031-1/+1
| | | | | | | | Contrary to progressive, just being able to crop up to 14/15 pixels is not enough to encode all supported resolutions, and the new behaviour is also consistent with e.g. MPEG-2 etc. Originally committed as revision 25669 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove usage of deprecated libavcodec/audioconvert.h functions.Stefano Sabatini2010-11-031-1/+2
| | | | Originally committed as revision 25668 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud