aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/utils.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit 'b146d74730ab9ec5abede9066f770ad851e45fbc'Michael Niedermayer2012-09-291-4/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b146d74730ab9ec5abede9066f770ad851e45fbc': indeo4: update AVCodecContext width/height on size change dfa: check that the caller set width/height properly. indeo5dec: Make sure we have had a valid gop header. cavsdec: check for changing w/h. lavc: set channel count from channel layout in avcodec_open2(). doc/platform: Rework the Visual Studio linking section doc/faq: Change the Visual Studio entry to reflect current status doc/platform: Replace Visual Studio section with build instructions doc/platform: Nuke section on linking static MinGW-built libs with MSVC doc/platform: Remove false claim about MinGW installer doc/platform: Mention MinGW-w64 dsputil_mmx: fix reading prior of the src array in sub_hfyu_median_prediction() mpegaudiodec: fix short_start calculation Conflicts: doc/faq.texi doc/platform.texi libavcodec/cavsdec.c libavcodec/indeo5.c libavcodec/ivi_common.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: set channel count from channel layout in avcodec_open2().Anton Khirnov2012-09-291-4/+9
| | | | | | | | | | Some decoders (e.g. nellymoser) only set channel_layout and do not set channel count.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-281-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dwt: Drop unused functions spatial_compose{53|97}i() nutdec: Remove unused and broken debug function stub avcodec: Drop long-deprecated imgconvert.h header Add Opus support to the Ogg muxer. Add Opus codec id and codec description. avformat: Identify anonymous AVIO typedef structs. Conflicts: libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/imgconvert.h libavcodec/version.h libavformat/oggenc.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Drop long-deprecated imgconvert.h headerDiego Biurrun2012-09-271-1/+0
| |
* | avcodec_alloc_frame: dont zero the whole struct twiceMichael Niedermayer2012-09-251-1/+2
| | | | | | | | | | | | cleaning it up is already done in avcodec_get_frame_defaults() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'Michael Niedermayer2012-09-251-15/+52
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7751e4693dd10ec98c20fbd9887233b575034272': ogg: check that the expected number of headers had been parsed libx264: change default to closed gop to match x264cli Use avcodec_free_frame() to free AVFrames. lavf: use a malloced AVFrame in try_decode_frame(). lavc: add avcodec_free_frame(). lavc: ensure extended_data is set properly on decoding lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults() lavc: use av_mallocz to allocate AVFrames. lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults Conflicts: doc/APIchanges doc/examples/decoding_encoding.c libavcodec/utils.c libavcodec/version.h libavfilter/src_movie.c libavformat/oggdec.c libavformat/oggdec.h libavformat/oggparsetheora.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add avcodec_free_frame().Anton Khirnov2012-09-241-0/+15
| | | | | | | | | | Since an AVFrame now has malloced members (extended_data), it must have a destructor.
| * lavc: ensure extended_data is set properly on decodingAnton Khirnov2012-09-241-0/+14
| |
| * lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults()Anton Khirnov2012-09-241-0/+4
| |
| * lavc: use av_mallocz to allocate AVFrames.Anton Khirnov2012-09-241-1/+1
| | | | | | | | | | Otherwise the frame is uninitialized, so avcodec_get_frame_defaults() cannot determine whether to free extended_data.
| * lavc: rename the argument of avcodec_alloc_frame/get_frame_defaultsAnton Khirnov2012-09-241-10/+10
| | | | | | | | | | AVFrame is used for both audio and video, so calling the argument 'pic' is misleading.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-231-2/+4
|\| | | | | | | | | | | | | | | | | | | * qatar/master: avcodec: fix memleak in avcodec_encode_audio2() Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: fix memleak in avcodec_encode_audio2()Justin Ruggles2012-09-221-3/+6
| | | | | | | | Ensure that padded_frame is freed before returning when needed.
* | Merge commit '1b3439b3055b083df51d7f7838ecc6b3f708b15c'Michael Niedermayer2012-09-191-236/+262
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b3439b3055b083df51d7f7838ecc6b3f708b15c': mpegvideo: move frame size dependent memory management to separate functions configure: add --toolchain option configure: Make the smoothstreaming muxer enable the ismv muxer smoothstreaming: Export the mp4 codec tags mov: check for EOF in long lasting loops avcodec: cleanup utils.c binkaudio: remove unneeded GET_BITS_SAFE macro binkaudio: use float sample format binkaudio: use a different value for the coefficient scale for the DCT codec Conflicts: configure libavcodec/mpegvideo.c libavcodec/utils.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: cleanup utils.cLuca Barbato2012-09-181-232/+263
| |
* | Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'Michael Niedermayer2012-09-181-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521': alsdec: Check k used for rice decoder. avfiltergraph: silence an uninitialized variable warning xsubenc: reindent lavc: replace AVCodecContext.encode with subtitle-specific callback lavc: add const to private codec class initialization. avconv: don't pass a bogus parameter to avfilter_graph_create_filter(). id3v2: strdup the genre name explicitly. lavf/id3v2: do not export empty fields. buffersrc: add const to the AVFrame* argument of av_buffersrc_write_frame() lavfi: replace empty input/output lists with null pointers Conflicts: ffmpeg_filter.c libavcodec/alsdec.c libavcodec/dvdsubenc.c libavcodec/utils.c libavcodec/v210dec.h libavfilter/af_channelsplit.c libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_ass.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: replace AVCodecContext.encode with subtitle-specific callbackAnton Khirnov2012-09-171-2/+2
| | | | | | | | | | AVCodecContext.encode is currently used only for subtitles, encode2 is used for audio and video.
| * lavc: add const to private codec class initialization.Anton Khirnov2012-09-171-1/+1
| | | | | | | | Silences a warning about discarding const.
* | lavc: set AVSubtitle.pts if possible.Nicolas George2012-09-151-0/+3
| | | | | | | | | | | | | | If the packet has a PTS and the corresponding time base is known, set the pts field of the decoded subtitle structure before the call to the decoder. The decoder is still allowed to change the PTS if necessary.
* | lavc: protect calls to frame_thread_encoder by HAVE_THREADSMichael Niedermayer2012-08-291-7/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | frame_thread_encoder: pass private optionsMichael Niedermayer2012-08-291-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: avcodec_get_name: return "none" for AV_CODEC_ID_NONE.Nicolas George2012-08-191-0/+2
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-181-5/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo_enc: don't use deprecated avcodec_encode_video(). cmdutils: refactor -codecs option. avconv: make -shortest a per-output file option. lavc: add avcodec_descriptor_get_by_name(). lavc: add const to AVCodec* function parameters. swf(dec): replace CODEC_ID with AV_CODEC_ID dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE rtmpdh: Do not generate the same private key every time when using libnettle rtp: remove ff_rtp_get_rtcp_file_handle(). rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle() avio: add (ff)url_get_multi_file_handle() for getting more than one fd h264: vdpau: fix crash with unsupported colorspace amrwbdec: Decode the fr_quality bit properly Conflicts: Changelog cmdutils.c cmdutils_common_opts.h doc/ffmpeg.texi ffmpeg.c ffmpeg.h ffmpeg_opt.c libavcodec/h264.c libavcodec/options.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add const to AVCodec* function parameters.Anton Khirnov2012-08-181-5/+6
| |
* | av_get_audio_frame_duration: fix ra144Michael Niedermayer2012-08-161-1/+2
| | | | | | | | | | | | Fixes Ticket1612 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: add const to AVCodecContext.codec_descriptor.Nicolas George2012-08-141-1/+1
| |
* | lavc: reimplement avcodec_get_name with descriptors.Nicolas George2012-08-141-5/+4
| |
* | lavc: add codec_descriptor field to AVCodecContext.Michael Niedermayer2012-08-121-0/+2
| | | | | | | | | | | | | | This can be used to avoid a time consuming lookup of the descriptor Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-119/+119
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-071-96/+96
| |
* | lavc/utils: rename ff_init_buffer_info() pic parameter to frameStefano Sabatini2012-08-031-16/+16
| | | | | | | | | | The new name is more expressive, given that the frame is not necessarily a picture but may be an audio frame.
* | lavc/utils: generalize ff_init_buffer_info() and use it when seems feasibleStefano Sabatini2012-08-031-36/+17
| | | | | | | | | | | | | | Extend ff_init_buffer_info() to init audio frames as well as video frames. Avoid code duplication.
* | lavc: add channels field to AVFrameStefano Sabatini2012-07-311-0/+4
| | | | | | | | | | | | This is required otherwise it is not always possible to guess the number of channels from the layout, for example if the channel layout is unknown.
* | avcodec: add decode_error_flags field to AVFrameMarton Balint2012-07-211-0/+1
| | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: set best_effort_timestamp for audio too.Nicolas George2012-07-201-0/+3
| |
* | lavc: update pkt_duration for skipped samples.Nicolas George2012-07-191-2/+7
| | | | | | | | Also: factor the the computation of the timestamp difference.
* | lavc: warn when impossible to adjust timestamps for skipped samples.Nicolas George2012-07-191-0/+2
| | | | | | | | It is likely to happen if pkt_timebase was not set.
* | lavc: add debug info about skipped samples.Nicolas George2012-07-191-0/+6
| |
* | cosmetics: reindent after d3abbb1d1Paul B Mahol2012-07-151-7/+7
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc: add metadata to AVFrameThomas Kühnel2012-07-141-0/+1
| | | | | | | | | | | | See thread: Subject: [libav-devel] [PATCH 1/3] avcodec: add metadata to AVFrame Date: Tue, 4 Oct 2011 00:19:51 +0200
* | lavc: adjust timestamp in case of skiping initial samplesMichael Niedermayer2012-07-141-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: skip initial silence when requestedMichael Niedermayer2012-07-141-0/+18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: add pkt_timebase to allow avcodec to adjust pkt_dts/pts when neededMichael Niedermayer2012-07-131-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: fix ff_alloc_packet()Paul B Mahol2012-07-131-0/+2
| | | | | | | | | | | | Regression introduced in 740b9ff44. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc: add av_fast_padded_malloczPaul B Mahol2012-07-101-0/+12
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Show hyphen in codec tag.Carl Eugen Hoyos2012-07-091-1/+1
| |
* | video_get_buffer: return ENOMEM instead of -1 on malloc failureMichael Niedermayer2012-07-041-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/utils: print error message on get_buffer related errorsMichael Niedermayer2012-07-041-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec_align_dimensions2: support 12 & 14 bit planar colorspacesMichael Niedermayer2012-07-031-0/+16
| | | | | | | | | | Reviewed-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec_encode_audio2: print error messages for errorsMichael Niedermayer2012-06-301-2/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>