June 2010 - ffmpeg-cvslog - lists.ffmpeg.org

r18351 - in trunk/libavcodec: 4xm.c 8bps.c 8svx.c aac.c aasc.c ac3dec.c adpcm.c adxdec.c alac.c apedec.c asv1.c atrac3.c avcodec.h avs.c bethsoftvideo.c bfi.c bmp.c c93.c cavsdec.c cinepak.c cljr.c...
by subversion＠mplayerhq.hu 14 Jul '10

14 Jul '10

Author: rbultje Date: Tue Apr 7 17:59:50 2009 New Revision: 18351 Log: Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows passing of packet-specific flags from demuxer to decoder, such as the keyframe flag, which appears necessary to playback corePNG P-frames. Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread "Google Summer of Code participation" on the mailinglist. Modified: trunk/libavcodec/4xm.c trunk/libavcodec/8bps.c trunk/libavcodec/8svx.c trunk/libavcodec/aac.c trunk/libavcodec/aasc.c trunk/libavcodec/ac3dec.c trunk/libavcodec/adpcm.c trunk/libavcodec/adxdec.c trunk/libavcodec/alac.c trunk/libavcodec/apedec.c trunk/libavcodec/asv1.c trunk/libavcodec/atrac3.c trunk/libavcodec/avcodec.h trunk/libavcodec/avs.c trunk/libavcodec/bethsoftvideo.c trunk/libavcodec/bfi.c trunk/libavcodec/bmp.c trunk/libavcodec/c93.c trunk/libavcodec/cavsdec.c trunk/libavcodec/cinepak.c trunk/libavcodec/cljr.c trunk/libavcodec/cook.c trunk/libavcodec/cscd.c trunk/libavcodec/cyuv.c trunk/libavcodec/dca.c trunk/libavcodec/dnxhddec.c trunk/libavcodec/dpcm.c trunk/libavcodec/dsicinav.c trunk/libavcodec/dv.c trunk/libavcodec/dvbsubdec.c trunk/libavcodec/dvdsubdec.c trunk/libavcodec/dxa.c trunk/libavcodec/eacmv.c trunk/libavcodec/eatgq.c trunk/libavcodec/eatgv.c trunk/libavcodec/eatqi.c trunk/libavcodec/escape124.c trunk/libavcodec/ffv1.c trunk/libavcodec/flacdec.c trunk/libavcodec/flashsv.c trunk/libavcodec/flicvideo.c trunk/libavcodec/fraps.c trunk/libavcodec/g726.c trunk/libavcodec/gifdec.c trunk/libavcodec/h261dec.c trunk/libavcodec/h263dec.c trunk/libavcodec/h264.c trunk/libavcodec/huffyuv.c trunk/libavcodec/idcinvideo.c trunk/libavcodec/imc.c trunk/libavcodec/indeo2.c trunk/libavcodec/indeo3.c trunk/libavcodec/interplayvideo.c trunk/libavcodec/kmvc.c trunk/libavcodec/lcldec.c trunk/libavcodec/libamr.c trunk/libavcodec/libdiracdec.c trunk/libavcodec/libfaad.c trunk/libavcodec/libgsm.c trunk/libavcodec/libopenjpeg.c trunk/libavcodec/libschroedingerdec.c trunk/libavcodec/libspeexdec.c trunk/libavcodec/loco.c trunk/libavcodec/mace.c trunk/libavcodec/mdec.c trunk/libavcodec/mimic.c trunk/libavcodec/mjpegbdec.c trunk/libavcodec/mjpegdec.c trunk/libavcodec/mjpegdec.h trunk/libavcodec/mlpdec.c trunk/libavcodec/mmvideo.c trunk/libavcodec/motionpixels.c trunk/libavcodec/mpc7.c trunk/libavcodec/mpc8.c trunk/libavcodec/mpeg12.c trunk/libavcodec/mpegaudiodec.c trunk/libavcodec/mpegvideo.h trunk/libavcodec/msrle.c trunk/libavcodec/msvideo1.c trunk/libavcodec/nellymoserdec.c trunk/libavcodec/nuv.c trunk/libavcodec/pcm.c trunk/libavcodec/pcx.c trunk/libavcodec/pngdec.c trunk/libavcodec/pnmenc.c trunk/libavcodec/ptx.c trunk/libavcodec/qcelpdec.c trunk/libavcodec/qdm2.c trunk/libavcodec/qdrw.c trunk/libavcodec/qpeg.c trunk/libavcodec/qtrle.c trunk/libavcodec/ra144.c trunk/libavcodec/ra288.c trunk/libavcodec/rawdec.c trunk/libavcodec/rl2.c trunk/libavcodec/roqvideodec.c trunk/libavcodec/rpza.c trunk/libavcodec/rv10.c trunk/libavcodec/rv34.c trunk/libavcodec/rv34.h trunk/libavcodec/sgidec.c trunk/libavcodec/shorten.c trunk/libavcodec/smacker.c trunk/libavcodec/smc.c trunk/libavcodec/snow.c trunk/libavcodec/sonic.c trunk/libavcodec/sp5xdec.c trunk/libavcodec/sunrast.c trunk/libavcodec/svq1dec.c trunk/libavcodec/svq3.c trunk/libavcodec/targa.c trunk/libavcodec/tiertexseqv.c trunk/libavcodec/tiff.c trunk/libavcodec/truemotion1.c trunk/libavcodec/truemotion2.c trunk/libavcodec/truespeech.c trunk/libavcodec/tscc.c trunk/libavcodec/tta.c trunk/libavcodec/txd.c trunk/libavcodec/ulti.c trunk/libavcodec/utils.c trunk/libavcodec/vb.c trunk/libavcodec/vc1.c trunk/libavcodec/vcr1.c trunk/libavcodec/vmdav.c trunk/libavcodec/vmnc.c trunk/libavcodec/vorbis_dec.c trunk/libavcodec/vp3.c trunk/libavcodec/vqavideo.c trunk/libavcodec/wavpack.c trunk/libavcodec/wmadec.c trunk/libavcodec/wnv1.c trunk/libavcodec/ws-snd1.c trunk/libavcodec/xan.c trunk/libavcodec/xl.c trunk/libavcodec/xsubdec.c trunk/libavcodec/zmbv.c Modified: trunk/libavcodec/4xm.c ============================================================================== --- trunk/libavcodec/4xm.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/4xm.c Tue Apr 7 17:59:50 2009 (r18351) @@ -677,8 +677,10 @@ static int decode_i_frame(FourXContext * static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; FourXContext * const f = avctx->priv_data; AVFrame *picture = data; AVFrame *p, temp; Modified: trunk/libavcodec/8bps.c ============================================================================== --- trunk/libavcodec/8bps.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/8bps.c Tue Apr 7 17:59:50 2009 (r18351) @@ -58,8 +58,10 @@ typedef struct EightBpsContext { * Decode a frame * */ -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size) +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; EightBpsContext * const c = avctx->priv_data; const unsigned char *encoded = buf; unsigned char *pixptr, *pixptr_end; Modified: trunk/libavcodec/8svx.c ============================================================================== --- trunk/libavcodec/8svx.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/8svx.c Tue Apr 7 17:59:50 2009 (r18351) @@ -42,8 +42,10 @@ static const int16_t exponential[16] = { /** decode a frame */ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; EightSvxContext *esc = avctx->priv_data; int16_t *out_data = data; int consumed = buf_size; Modified: trunk/libavcodec/aac.c ============================================================================== --- trunk/libavcodec/aac.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/aac.c Tue Apr 7 17:59:50 2009 (r18351) @@ -1604,7 +1604,9 @@ static int parse_adts_frame_header(AACCo return size; } -static int aac_decode_frame(AVCodecContext * avccontext, void * data, int * data_size, const uint8_t * buf, int buf_size) { +static int aac_decode_frame(AVCodecContext * avccontext, void * data, int * data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; AACContext * ac = avccontext->priv_data; ChannelElement * che = NULL; GetBitContext gb; Modified: trunk/libavcodec/aasc.c ============================================================================== --- trunk/libavcodec/aasc.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/aasc.c Tue Apr 7 17:59:50 2009 (r18351) @@ -59,8 +59,10 @@ static av_cold int aasc_decode_init(AVCo static int aasc_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; AascContext *s = avctx->priv_data; int compr, i, stride; Modified: trunk/libavcodec/ac3dec.c ============================================================================== --- trunk/libavcodec/ac3dec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/ac3dec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -1226,8 +1226,10 @@ static int decode_audio_block(AC3DecodeC * Decode a single AC-3 frame. */ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; AC3DecodeContext *s = avctx->priv_data; int16_t *out_samples = (int16_t *)data; int blk, ch, err; Modified: trunk/libavcodec/adpcm.c ============================================================================== --- trunk/libavcodec/adpcm.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/adpcm.c Tue Apr 7 17:59:50 2009 (r18351) @@ -877,8 +877,10 @@ static void xa_decode(short *out, const static int adpcm_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; ADPCMContext *c = avctx->priv_data; ADPCMChannelStatus *cs; int n, m, channel, i; Modified: trunk/libavcodec/adxdec.c ============================================================================== --- trunk/libavcodec/adxdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/adxdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -104,8 +104,10 @@ static int adx_decode_header(AVCodecCont static int adx_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf0, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf0 = avpkt->data; + int buf_size = avpkt->size; ADXContext *c = avctx->priv_data; short *samples = data; const uint8_t *buf = buf0; Modified: trunk/libavcodec/alac.c ============================================================================== --- trunk/libavcodec/alac.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/alac.c Tue Apr 7 17:59:50 2009 (r18351) @@ -400,8 +400,10 @@ static void reconstruct_stereo_16(int32_ static int alac_decode_frame(AVCodecContext *avctx, void *outbuffer, int *outputsize, - const uint8_t *inbuffer, int input_buffer_size) + AVPacket *avpkt) { + const uint8_t *inbuffer = avpkt->data; + int input_buffer_size = avpkt->size; ALACContext *alac = avctx->priv_data; int channels; Modified: trunk/libavcodec/apedec.c ============================================================================== --- trunk/libavcodec/apedec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/apedec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -806,8 +806,10 @@ static void ape_unpack_stereo(APEContext static int ape_decode_frame(AVCodecContext * avctx, void *data, int *data_size, - const uint8_t * buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; APEContext *s = avctx->priv_data; int16_t *samples = data; int nblocks; Modified: trunk/libavcodec/asv1.c ============================================================================== --- trunk/libavcodec/asv1.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/asv1.c Tue Apr 7 17:59:50 2009 (r18351) @@ -387,8 +387,10 @@ static inline void dct_get(ASV1Context * static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; ASV1Context * const a = avctx->priv_data; AVFrame *picture = data; AVFrame * const p= (AVFrame*)&a->picture; Modified: trunk/libavcodec/atrac3.c ============================================================================== --- trunk/libavcodec/atrac3.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/atrac3.c Tue Apr 7 17:59:50 2009 (r18351) @@ -878,7 +878,9 @@ static int decodeFrame(ATRAC3Context *q, static int atrac3_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) { + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; ATRAC3Context *q = avctx->priv_data; int result = 0, i; const uint8_t* databuf; Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/avcodec.h Tue Apr 7 17:59:50 2009 (r18351) @@ -2429,8 +2429,7 @@ typedef struct AVCodec { int (*init)(AVCodecContext *); int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data); int (*close)(AVCodecContext *); - int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, - const uint8_t *buf, int buf_size); + int (*decode)(AVCodecContext *, void *outdata, int *outdata_size, AVPacket *avpkt); /** * Codec capabilities. * see CODEC_CAP_* @@ -3020,26 +3019,45 @@ int avcodec_default_execute(AVCodecConte */ int avcodec_open(AVCodecContext *avctx, AVCodec *codec); +#if LIBAVCODEC_VERSION_MAJOR < 53 /** * Decodes an audio frame from \p buf into \p samples. - * The avcodec_decode_audio2() function decodes an audio frame from the input - * buffer \p buf of size \p buf_size. To decode it, it makes use of the + * Wrapper function which calls avcodec_decode_audio3. + * + * @deprecated Use avcodec_decode_audio3 instead. + * @param avctx the codec context + * @param[out] samples the output buffer + * @param[in,out] frame_size_ptr the output buffer size in bytes + * @param[in] buf the input buffer + * @param[in] buf_size the input buffer size in bytes + * @return On error a negative value is returned, otherwise the number of bytes + * used or zero if no frame could be decompressed. + */ +attribute_deprecated int avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples, + int *frame_size_ptr, + const uint8_t *buf, int buf_size); +#endif + +/** + * Decodes an audio frame from \p avpkt->data into \p samples. + * The avcodec_decode_audio3() function decodes an audio frame from the input + * buffer \p avpkt->data of size \p avpkt->size. To decode it, it makes use of the * audio codec which was coupled with \p avctx using avcodec_open(). The * resulting decoded frame is stored in output buffer \p samples. If no frame * could be decompressed, \p frame_size_ptr is zero. Otherwise, it is the * decompressed frame size in \e bytes. * * @warning You \e must set \p frame_size_ptr to the allocated size of the - * output buffer before calling avcodec_decode_audio2(). + * output buffer before calling avcodec_decode_audio3(). * * @warning The input buffer must be \c FF_INPUT_BUFFER_PADDING_SIZE larger than * the actual read bytes because some optimized bitstream readers read 32 or 64 * bits at once and could read over the end. * - * @warning The end of the input buffer \p buf should be set to 0 to ensure that + * @warning The end of the input buffer \p avpkt->data should be set to 0 to ensure that * no overreading happens for damaged MPEG streams. * - * @note You might have to align the input buffer \p buf and output buffer \p + * @note You might have to align the input buffer \p avpkt->data and output buffer \p * samples. The alignment requirements depend on the CPU: On some CPUs it isn't * necessary at all, on others it won't work at all if not aligned and on others * it will work but it will have an impact on performance. In practice, the @@ -3051,19 +3069,37 @@ int avcodec_open(AVCodecContext *avctx, * @param avctx the codec context * @param[out] samples the output buffer * @param[in,out] frame_size_ptr the output buffer size in bytes - * @param[in] buf the input buffer - * @param[in] buf_size the input buffer size in bytes + * @param[in] avpkt The input AVPacket containing the input buffer. * @return On error a negative value is returned, otherwise the number of bytes * used or zero if no frame could be decompressed. */ -int avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples, +int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, - const uint8_t *buf, int buf_size); + AVPacket *avpkt); +#if LIBAVCODEC_VERSION_MAJOR < 53 /** * Decodes a video frame from \p buf into \p picture. - * The avcodec_decode_video() function decodes a video frame from the input - * buffer \p buf of size \p buf_size. To decode it, it makes use of the + * Wrapper function which calls avcodec_decode_video2. + * + * @deprecated Use avcodec_decode_video2 instead. + * @param avctx the codec context + * @param[out] picture The AVFrame in which the decoded video frame will be stored. + * @param[in] buf the input buffer + * @param[in] buf_size the size of the input buffer in bytes + * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero. + * @return On error a negative value is returned, otherwise the number of bytes + * used or zero if no frame could be decompressed. + */ +attribute_deprecated int avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture, + int *got_picture_ptr, + const uint8_t *buf, int buf_size); +#endif + +/** + * Decodes a video frame from \p avpkt->data into \p picture. + * The avcodec_decode_video2() function decodes a video frame from the input + * buffer \p avpkt->data of size \p avpkt->size. To decode it, it makes use of the * video codec which was coupled with \p avctx using avcodec_open(). The * resulting decoded frame is stored in \p picture. * @@ -3074,7 +3110,7 @@ int avcodec_decode_audio2(AVCodecContext * @warning The end of the input buffer \p buf should be set to 0 to ensure that * no overreading happens for damaged MPEG streams. * - * @note You might have to align the input buffer \p buf and output buffer \p + * @note You might have to align the input buffer \p avpkt->data and output buffer \p * samples. The alignment requirements depend on the CPU: on some CPUs it isn't * necessary at all, on others it won't work at all if not aligned and on others * it will work but it will have an impact on performance. In practice, the @@ -3084,26 +3120,42 @@ int avcodec_decode_audio2(AVCodecContext * start of the buffer to 16. * * @note Some codecs have a delay between input and output, these need to be - * feeded with buf=NULL, buf_size=0 at the end to return the remaining frames. + * feeded with avpkt->data=NULL, avpkt->size=0 at the end to return the remaining frames. * * @param avctx the codec context * @param[out] picture The AVFrame in which the decoded video frame will be stored. - * @param[in] buf the input buffer - * @param[in] buf_size the size of the input buffer in bytes + * @param[in] avpkt The input AVpacket containing the input buffer. * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero. * @return On error a negative value is returned, otherwise the number of bytes * used or zero if no frame could be decompressed. */ -int avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture, +int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, int *got_picture_ptr, - const uint8_t *buf, int buf_size); + AVPacket *avpkt); +#if LIBAVCODEC_VERSION_MAJOR < 53 /* Decode a subtitle message. Return -1 if error, otherwise return the * number of bytes used. If no subtitle could be decompressed, * got_sub_ptr is zero. Otherwise, the subtitle is stored in *sub. */ -int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub, +attribute_deprecated int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub, int *got_sub_ptr, const uint8_t *buf, int buf_size); +#endif + +/** + * Decodes a subtitle message. + * Returns -1 if error, otherwise returns the number of bytes used. + * If no subtitle could be decompressed, \p got_sub_ptr is zero. + * Otherwise, the subtitle is stored in \p *sub. + * + * @param avctx the codec context + * @param[out] sub The AVSubtitle in which the decoded subtitle will be stored. + * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed, otherwise, it is nonzero. + * @param[in] avpkt The input AVPacket containing the input buffer. + */ +int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, + int *got_sub_ptr, + AVPacket *avpkt); int avcodec_parse_frame(AVCodecContext *avctx, uint8_t **pdata, int *data_size_ptr, uint8_t *buf, int buf_size); Modified: trunk/libavcodec/avs.c ============================================================================== --- trunk/libavcodec/avs.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/avs.c Tue Apr 7 17:59:50 2009 (r18351) @@ -44,8 +44,10 @@ typedef enum { static int avs_decode_frame(AVCodecContext * avctx, - void *data, int *data_size, const uint8_t * buf, int buf_size) + void *data, int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; AvsContext *const avs = avctx->priv_data; AVFrame *picture = data; AVFrame *const p = (AVFrame *) & avs->picture; Modified: trunk/libavcodec/bethsoftvideo.c ============================================================================== --- trunk/libavcodec/bethsoftvideo.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/bethsoftvideo.c Tue Apr 7 17:59:50 2009 (r18351) @@ -58,8 +58,10 @@ static void set_palette(AVFrame * frame, static int bethsoftvid_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; BethsoftvidContext * vid = avctx->priv_data; char block_type; uint8_t * dst; Modified: trunk/libavcodec/bfi.c ============================================================================== --- trunk/libavcodec/bfi.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/bfi.c Tue Apr 7 17:59:50 2009 (r18351) @@ -45,9 +45,10 @@ static av_cold int bfi_decode_init(AVCod } static int bfi_decode_frame(AVCodecContext * avctx, void *data, - int *data_size, const uint8_t * buf, - int buf_size) + int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; BFIContext *bfi = avctx->priv_data; uint8_t *dst = bfi->dst; uint8_t *src, *dst_offset, colour1, colour2; Modified: trunk/libavcodec/bmp.c ============================================================================== --- trunk/libavcodec/bmp.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/bmp.c Tue Apr 7 17:59:50 2009 (r18351) @@ -35,8 +35,10 @@ static av_cold int bmp_decode_init(AVCod static int bmp_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; BMPContext *s = avctx->priv_data; AVFrame *picture = data; AVFrame *p = &s->picture; Modified: trunk/libavcodec/c93.c ============================================================================== --- trunk/libavcodec/c93.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/c93.c Tue Apr 7 17:59:50 2009 (r18351) @@ -113,8 +113,10 @@ static inline void draw_n_color(uint8_t } static int decode_frame(AVCodecContext *avctx, void *data, - int *data_size, const uint8_t * buf, int buf_size) + int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; C93DecoderContext * const c93 = avctx->priv_data; AVFrame * const newpic = &c93->pictures[c93->currentpic]; AVFrame * const oldpic = &c93->pictures[c93->currentpic^1]; Modified: trunk/libavcodec/cavsdec.c ============================================================================== --- trunk/libavcodec/cavsdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/cavsdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -625,7 +625,9 @@ static void cavs_flush(AVCodecContext * } static int cavs_decode_frame(AVCodecContext * avctx,void *data, int *data_size, - const uint8_t * buf, int buf_size) { + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; AVSContext *h = avctx->priv_data; MpegEncContext *s = &h->s; int input_size; Modified: trunk/libavcodec/cinepak.c ============================================================================== --- trunk/libavcodec/cinepak.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/cinepak.c Tue Apr 7 17:59:50 2009 (r18351) @@ -411,8 +411,10 @@ static av_cold int cinepak_decode_init(A static int cinepak_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; CinepakContext *s = avctx->priv_data; s->data = buf; Modified: trunk/libavcodec/cljr.c ============================================================================== --- trunk/libavcodec/cljr.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/cljr.c Tue Apr 7 17:59:50 2009 (r18351) @@ -42,8 +42,10 @@ typedef struct CLJRContext{ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; CLJRContext * const a = avctx->priv_data; AVFrame *picture = data; AVFrame * const p= (AVFrame*)&a->picture; Modified: trunk/libavcodec/cook.c ============================================================================== --- trunk/libavcodec/cook.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/cook.c Tue Apr 7 17:59:50 2009 (r18351) @@ -979,7 +979,9 @@ static int decode_subpacket(COOKContext static int cook_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) { + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; COOKContext *q = avctx->priv_data; if (buf_size < avctx->block_align) Modified: trunk/libavcodec/cscd.c ============================================================================== --- trunk/libavcodec/cscd.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/cscd.c Tue Apr 7 17:59:50 2009 (r18351) @@ -135,7 +135,9 @@ static void add_frame_32(AVFrame *f, con #endif static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) { + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; CamStudioContext *c = avctx->priv_data; AVFrame *picture = data; Modified: trunk/libavcodec/cyuv.c ============================================================================== --- trunk/libavcodec/cyuv.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/cyuv.c Tue Apr 7 17:59:50 2009 (r18351) @@ -60,8 +60,10 @@ static av_cold int cyuv_decode_init(AVCo static int cyuv_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; CyuvDecodeContext *s=avctx->priv_data; unsigned char *y_plane; Modified: trunk/libavcodec/dca.c ============================================================================== --- trunk/libavcodec/dca.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/dca.c Tue Apr 7 17:59:50 2009 (r18351) @@ -1209,8 +1209,10 @@ static int dca_convert_bitstream(const u */ static int dca_decode_frame(AVCodecContext * avctx, void *data, int *data_size, - const uint8_t * buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; int i; int16_t *samples = data; Modified: trunk/libavcodec/dnxhddec.c ============================================================================== --- trunk/libavcodec/dnxhddec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/dnxhddec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -278,8 +278,10 @@ static int dnxhd_decode_macroblocks(DNXH } static int dnxhd_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; DNXHDContext *ctx = avctx->priv_data; AVFrame *picture = data; int first_field = 1; Modified: trunk/libavcodec/dpcm.c ============================================================================== --- trunk/libavcodec/dpcm.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/dpcm.c Tue Apr 7 17:59:50 2009 (r18351) @@ -161,8 +161,10 @@ static av_cold int dpcm_decode_init(AVCo static int dpcm_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; DPCMContext *s = avctx->priv_data; int in, out = 0; int predictor[2]; Modified: trunk/libavcodec/dsicinav.c ============================================================================== --- trunk/libavcodec/dsicinav.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/dsicinav.c Tue Apr 7 17:59:50 2009 (r18351) @@ -195,8 +195,10 @@ static void cin_decode_rle(const unsigne static int cinvideo_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; CinVideoContext *cin = avctx->priv_data; int i, y, palette_type, palette_colors_count, bitmap_frame_type, bitmap_frame_size; @@ -312,8 +314,10 @@ static av_cold int cinaudio_decode_init( static int cinaudio_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; CinAudioContext *cin = avctx->priv_data; const uint8_t *src = buf; int16_t *samples = (int16_t *)data; Modified: trunk/libavcodec/dv.c ============================================================================== --- trunk/libavcodec/dv.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/dv.c Tue Apr 7 17:59:50 2009 (r18351) @@ -1111,8 +1111,10 @@ static int dv_encode_video_segment(AVCod 144000 bytes for PAL - or twice those for 50Mbps) */ static int dvvideo_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; DVVideoContext *s = avctx->priv_data; s->sys = dv_frame_profile(buf); Modified: trunk/libavcodec/dvbsubdec.c ============================================================================== --- trunk/libavcodec/dvbsubdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/dvbsubdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -1345,8 +1345,10 @@ static int dvbsub_display_end_segment(AV static int dvbsub_decode(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; AVSubtitle *sub = (AVSubtitle*) data; const uint8_t *p, *p_end; Modified: trunk/libavcodec/dvdsubdec.c ============================================================================== --- trunk/libavcodec/dvdsubdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/dvdsubdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -475,8 +475,10 @@ static void ppm_save(const char *filenam static int dvdsub_decode(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; AVSubtitle *sub = (void *)data; int is_menu; Modified: trunk/libavcodec/dxa.c ============================================================================== --- trunk/libavcodec/dxa.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/dxa.c Tue Apr 7 17:59:50 2009 (r18351) @@ -188,8 +188,10 @@ static int decode_13(AVCodecContext *avc return 0; } -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size) +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; DxaDecContext * const c = avctx->priv_data; uint8_t *outptr, *srcptr, *tmpptr; unsigned long dsize; Modified: trunk/libavcodec/eacmv.c ============================================================================== --- trunk/libavcodec/eacmv.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/eacmv.c Tue Apr 7 17:59:50 2009 (r18351) @@ -144,8 +144,10 @@ static void cmv_process_header(CmvContex static int cmv_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; CmvContext *s = avctx->priv_data; const uint8_t *buf_end = buf + buf_size; Modified: trunk/libavcodec/eatgq.c ============================================================================== --- trunk/libavcodec/eatgq.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/eatgq.c Tue Apr 7 17:59:50 2009 (r18351) @@ -190,7 +190,9 @@ static void tgq_calculate_qtable(TgqCont static int tgq_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size){ + AVPacket *avpkt){ + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; const uint8_t *buf_start = buf; const uint8_t *buf_end = buf + buf_size; TgqContext *s = avctx->priv_data; Modified: trunk/libavcodec/eatgv.c ============================================================================== --- trunk/libavcodec/eatgv.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/eatgv.c Tue Apr 7 17:59:50 2009 (r18351) @@ -237,8 +237,10 @@ static void cond_release_buffer(AVFrame static int tgv_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; TgvContext *s = avctx->priv_data; const uint8_t *buf_end = buf + buf_size; int chunk_type; Modified: trunk/libavcodec/eatqi.c ============================================================================== --- trunk/libavcodec/eatqi.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/eatqi.c Tue Apr 7 17:59:50 2009 (r18351) @@ -101,8 +101,10 @@ static void tqi_calculate_qtable(MpegEnc static int tqi_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; const uint8_t *buf_end = buf+buf_size; TqiContext *t = avctx->priv_data; MpegEncContext *s = &t->s; Modified: trunk/libavcodec/escape124.c ============================================================================== --- trunk/libavcodec/escape124.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/escape124.c Tue Apr 7 17:59:50 2009 (r18351) @@ -206,8 +206,10 @@ static const uint16_t mask_matrix[] = {0 */ static int escape124_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; Escape124Context *s = avctx->priv_data; GetBitContext gb; Modified: trunk/libavcodec/ffv1.c ============================================================================== --- trunk/libavcodec/ffv1.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/ffv1.c Tue Apr 7 17:59:50 2009 (r18351) @@ -936,7 +936,9 @@ static av_cold int decode_init(AVCodecCo return 0; } -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size){ +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt){ + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; FFV1Context *f = avctx->priv_data; RangeCoder * const c= &f->c; const int width= f->width; Modified: trunk/libavcodec/flacdec.c ============================================================================== --- trunk/libavcodec/flacdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/flacdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -636,8 +636,10 @@ static int decode_frame(FLACContext *s) static int flac_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; FLACContext *s = avctx->priv_data; int i, j = 0, input_buf_size = 0, bytes_read = 0; int16_t *samples_16 = data; Modified: trunk/libavcodec/flashsv.c ============================================================================== --- trunk/libavcodec/flashsv.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/flashsv.c Tue Apr 7 17:59:50 2009 (r18351) @@ -102,8 +102,10 @@ static av_cold int flashsv_decode_init(A static int flashsv_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; FlashSVContext *s = avctx->priv_data; int h_blocks, v_blocks, h_part, v_part, i, j; GetBitContext gb; Modified: trunk/libavcodec/flicvideo.c ============================================================================== --- trunk/libavcodec/flicvideo.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/flicvideo.c Tue Apr 7 17:59:50 2009 (r18351) @@ -701,8 +701,10 @@ static int flic_decode_frame_24BPP(AVCod static int flic_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; if (avctx->pix_fmt == PIX_FMT_PAL8) { return flic_decode_frame_8BPP(avctx, data, data_size, buf, buf_size); Modified: trunk/libavcodec/fraps.c ============================================================================== --- trunk/libavcodec/fraps.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/fraps.c Tue Apr 7 17:59:50 2009 (r18351) @@ -130,8 +130,10 @@ static int fraps2_decode_plane(FrapsCont */ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; FrapsContext * const s = avctx->priv_data; AVFrame *frame = data; AVFrame * const f = (AVFrame*)&s->frame; Modified: trunk/libavcodec/g726.c ============================================================================== --- trunk/libavcodec/g726.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/g726.c Tue Apr 7 17:59:50 2009 (r18351) @@ -363,8 +363,10 @@ static int g726_encode_frame(AVCodecCont static int g726_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; G726Context *c = avctx->priv_data; short *samples = data; GetBitContext gb; Modified: trunk/libavcodec/gifdec.c ============================================================================== --- trunk/libavcodec/gifdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/gifdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -282,8 +282,10 @@ static av_cold int gif_decode_init(AVCod return 0; } -static int gif_decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size) +static int gif_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; GifState *s = avctx->priv_data; AVFrame *picture = data; int ret; Modified: trunk/libavcodec/h261dec.c ============================================================================== --- trunk/libavcodec/h261dec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/h261dec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -543,8 +543,10 @@ static int get_consumed_bytes(MpegEncCon static int h261_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; H261Context *h= avctx->priv_data; MpegEncContext *s = &h->s; int ret; Modified: trunk/libavcodec/h263dec.c ============================================================================== --- trunk/libavcodec/h263dec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/h263dec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -331,8 +331,10 @@ static int decode_slice(MpegEncContext * int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MpegEncContext *s = avctx->priv_data; int ret; AVFrame *pict = data; Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/h264.c Tue Apr 7 17:59:50 2009 (r18351) @@ -7618,8 +7618,10 @@ static int get_consumed_bytes(MpegEncCon static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; H264Context *h = avctx->priv_data; MpegEncContext *s = &h->s; AVFrame *pict = data; Modified: trunk/libavcodec/huffyuv.c ============================================================================== --- trunk/libavcodec/huffyuv.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/huffyuv.c Tue Apr 7 17:59:50 2009 (r18351) @@ -942,7 +942,9 @@ static void draw_slice(HYuvContext *s, i s->last_slice_end= y + h; } -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size){ +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt){ + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; HYuvContext *s = avctx->priv_data; const int width= s->width; const int width2= s->width>>1; Modified: trunk/libavcodec/idcinvideo.c ============================================================================== --- trunk/libavcodec/idcinvideo.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/idcinvideo.c Tue Apr 7 17:59:50 2009 (r18351) @@ -209,8 +209,10 @@ static void idcin_decode_vlcs(IdcinConte static int idcin_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; IdcinContext *s = avctx->priv_data; AVPaletteControl *palette_control = avctx->palctrl; Modified: trunk/libavcodec/imc.c ============================================================================== --- trunk/libavcodec/imc.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/imc.c Tue Apr 7 17:59:50 2009 (r18351) @@ -639,8 +639,10 @@ static int imc_get_coeffs (IMCContext* q static int imc_decode_frame(AVCodecContext * avctx, void *data, int *data_size, - const uint8_t * buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; IMCContext *q = avctx->priv_data; Modified: trunk/libavcodec/indeo2.c ============================================================================== --- trunk/libavcodec/indeo2.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/indeo2.c Tue Apr 7 17:59:50 2009 (r18351) @@ -136,8 +136,10 @@ static int ir2_decode_plane_inter(Ir2Con static int ir2_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; Ir2Context * const s = avctx->priv_data; AVFrame *picture = data; AVFrame * const p= (AVFrame*)&s->picture; Modified: trunk/libavcodec/indeo3.c ============================================================================== --- trunk/libavcodec/indeo3.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/indeo3.c Tue Apr 7 17:59:50 2009 (r18351) @@ -1062,8 +1062,10 @@ static int iv_decode_frame(Indeo3DecodeC static int indeo3_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; Indeo3DecodeContext *s=avctx->priv_data; uint8_t *src, *dest; int y; Modified: trunk/libavcodec/interplayvideo.c ============================================================================== --- trunk/libavcodec/interplayvideo.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/interplayvideo.c Tue Apr 7 17:59:50 2009 (r18351) @@ -639,8 +639,10 @@ static av_cold int ipvideo_decode_init(A static int ipvideo_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; IpvideoContext *s = avctx->priv_data; AVPaletteControl *palette_control = avctx->palctrl; Modified: trunk/libavcodec/kmvc.c ============================================================================== --- trunk/libavcodec/kmvc.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/kmvc.c Tue Apr 7 17:59:50 2009 (r18351) @@ -224,9 +224,10 @@ static void kmvc_decode_inter_8x8(KmvcCo } } -static int decode_frame(AVCodecContext * avctx, void *data, int *data_size, const uint8_t * buf, - int buf_size) +static int decode_frame(AVCodecContext * avctx, void *data, int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; KmvcContext *const ctx = avctx->priv_data; uint8_t *out, *src; int i; Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/lcldec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -161,8 +161,10 @@ static unsigned int mszh_decomp(unsigned * Decode a frame * */ -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size) +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; LclDecContext * const c = avctx->priv_data; unsigned char *encoded = (unsigned char *)buf; unsigned int pixel_ptr; Modified: trunk/libavcodec/libamr.c ============================================================================== --- trunk/libavcodec/libamr.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/libamr.c Tue Apr 7 17:59:50 2009 (r18351) @@ -245,8 +245,10 @@ static av_cold int amr_nb_decode_close(A static int amr_nb_decode_frame(AVCodecContext * avctx, void *data, int *data_size, - const uint8_t * buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; AMRContext *s = avctx->priv_data; const uint8_t*amrData=buf; int offset=0; @@ -654,8 +656,10 @@ static int amr_wb_decode_init(AVCodecCon static int amr_wb_decode_frame(AVCodecContext * avctx, void *data, int *data_size, - const uint8_t * buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; AMRWBContext *s = avctx->priv_data; const uint8_t*amrData=buf; int mode; Modified: trunk/libavcodec/libdiracdec.c ============================================================================== --- trunk/libavcodec/libdiracdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/libdiracdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -77,8 +77,10 @@ static av_cold int libdirac_decode_init( static int libdirac_decode_frame(AVCodecContext *avccontext, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; FfmpegDiracDecoderParams *p_dirac_params = avccontext->priv_data; AVPicture *picture = data; Modified: trunk/libavcodec/libfaad.c ============================================================================== --- trunk/libavcodec/libfaad.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/libfaad.c Tue Apr 7 17:59:50 2009 (r18351) @@ -149,8 +149,10 @@ static av_cold int faac_init_mp4(AVCodec static int faac_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; FAACContext *s = avctx->priv_data; #ifndef FAAD2_VERSION unsigned long bytesconsumed; Modified: trunk/libavcodec/libgsm.c ============================================================================== --- trunk/libavcodec/libgsm.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/libgsm.c Tue Apr 7 17:59:50 2009 (r18351) @@ -138,7 +138,9 @@ AVCodec libgsm_ms_encoder = { static int libgsm_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - uint8_t *buf, int buf_size) { + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; *data_size = 0; /* In case of error */ if(buf_size < avctx->block_align) return -1; switch(avctx->codec_id) { Modified: trunk/libavcodec/libopenjpeg.c ============================================================================== --- trunk/libavcodec/libopenjpeg.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/libopenjpeg.c Tue Apr 7 17:59:50 2009 (r18351) @@ -58,8 +58,10 @@ static av_cold int libopenjpeg_decode_in static int libopenjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; LibOpenJPEGContext *ctx = avctx->priv_data; AVFrame *picture = &ctx->image, *output = data; opj_dinfo_t *dec; Modified: trunk/libavcodec/libschroedingerdec.c ============================================================================== --- trunk/libavcodec/libschroedingerdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/libschroedingerdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -207,8 +207,10 @@ static void libschroedinger_handle_first static int libschroedinger_decode_frame(AVCodecContext *avccontext, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; FfmpegSchroDecoderParams *p_schro_params = avccontext->priv_data; SchroDecoder *decoder = p_schro_params->decoder; Modified: trunk/libavcodec/libspeexdec.c ============================================================================== --- trunk/libavcodec/libspeexdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/libspeexdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -90,8 +90,10 @@ static av_cold int libspeex_decode_init( static int libspeex_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; LibSpeexContext *s = avctx->priv_data; int16_t *output = data, *end; int i, num_samples; Modified: trunk/libavcodec/loco.c ============================================================================== --- trunk/libavcodec/loco.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/loco.c Tue Apr 7 17:59:50 2009 (r18351) @@ -158,8 +158,10 @@ static int loco_decode_plane(LOCOContext static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; LOCOContext * const l = avctx->priv_data; AVFrame * const p= (AVFrame*)&l->pic; int decoded; Modified: trunk/libavcodec/mace.c ============================================================================== --- trunk/libavcodec/mace.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/mace.c Tue Apr 7 17:59:50 2009 (r18351) @@ -236,8 +236,10 @@ static av_cold int mace_decode_init(AVCo static int mace_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; int16_t *samples = data; MACEContext *ctx = avctx->priv_data; int i, j, k, l; Modified: trunk/libavcodec/mdec.c ============================================================================== --- trunk/libavcodec/mdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/mdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -154,8 +154,10 @@ static inline void idct_put(MDECContext static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MDECContext * const a = avctx->priv_data; AVFrame *picture = data; AVFrame * const p= &a->picture; Modified: trunk/libavcodec/mimic.c ============================================================================== --- trunk/libavcodec/mimic.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/mimic.c Tue Apr 7 17:59:50 2009 (r18351) @@ -274,8 +274,10 @@ static void prepare_avpic(MimicContext * } static int mimic_decode_frame(AVCodecContext *avctx, void *data, - int *data_size, const uint8_t *buf, int buf_size) + int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MimicContext *ctx = avctx->priv_data; int is_pframe; int width, height; Modified: trunk/libavcodec/mjpegbdec.c ============================================================================== --- trunk/libavcodec/mjpegbdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/mjpegbdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -31,8 +31,10 @@ static int mjpegb_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MJpegDecodeContext *s = avctx->priv_data; const uint8_t *buf_end, *buf_ptr; AVFrame *picture = data; Modified: trunk/libavcodec/mjpegdec.c ============================================================================== --- trunk/libavcodec/mjpegdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/mjpegdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -1258,8 +1258,10 @@ found: int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MJpegDecodeContext *s = avctx->priv_data; const uint8_t *buf_end, *buf_ptr; int start_code; Modified: trunk/libavcodec/mjpegdec.h ============================================================================== --- trunk/libavcodec/mjpegdec.h Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/mjpegdec.h Tue Apr 7 17:59:50 2009 (r18351) @@ -106,7 +106,7 @@ int ff_mjpeg_decode_init(AVCodecContext int ff_mjpeg_decode_end(AVCodecContext *avctx); int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size); + AVPacket *avpkt); int ff_mjpeg_decode_dqt(MJpegDecodeContext *s); int ff_mjpeg_decode_dht(MJpegDecodeContext *s); int ff_mjpeg_decode_sof(MJpegDecodeContext *s); Modified: trunk/libavcodec/mlpdec.c ============================================================================== --- trunk/libavcodec/mlpdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/mlpdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -904,8 +904,10 @@ static int output_data(MLPDecodeContext * otherwise returns the number of bytes consumed. */ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MLPDecodeContext *m = avctx->priv_data; GetBitContext gb; unsigned int length, substr; Modified: trunk/libavcodec/mmvideo.c ============================================================================== --- trunk/libavcodec/mmvideo.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/mmvideo.c Tue Apr 7 17:59:50 2009 (r18351) @@ -159,8 +159,10 @@ static void mm_decode_inter(MmContext * static int mm_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MmContext *s = avctx->priv_data; const uint8_t *buf_end = buf+buf_size; int type; Modified: trunk/libavcodec/motionpixels.c ============================================================================== --- trunk/libavcodec/motionpixels.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/motionpixels.c Tue Apr 7 17:59:50 2009 (r18351) @@ -281,8 +281,10 @@ static void mp_decode_frame_helper(Motio static int mp_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MotionPixelsContext *mp = avctx->priv_data; GetBitContext gb; int i, count1, count2, sz; Modified: trunk/libavcodec/mpc7.c ============================================================================== --- trunk/libavcodec/mpc7.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/mpc7.c Tue Apr 7 17:59:50 2009 (r18351) @@ -156,8 +156,10 @@ static inline void idx_to_quant(MPCConte static int mpc7_decode_frame(AVCodecContext * avctx, void *data, int *data_size, - const uint8_t * buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MPCContext *c = avctx->priv_data; GetBitContext gb; uint8_t *bits; Modified: trunk/libavcodec/mpc8.c ============================================================================== --- trunk/libavcodec/mpc8.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/mpc8.c Tue Apr 7 17:59:50 2009 (r18351) @@ -180,8 +180,10 @@ static av_cold int mpc8_decode_init(AVCo static int mpc8_decode_frame(AVCodecContext * avctx, void *data, int *data_size, - const uint8_t * buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MPCContext *c = avctx->priv_data; GetBitContext gb2, *gb = &gb2; int i, j, k, ch, cnt, res, t; Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/mpeg12.c Tue Apr 7 17:59:50 2009 (r18351) @@ -2260,8 +2260,10 @@ static int decode_chunks(AVCodecContext /* handle buffering and image synchronisation */ static int mpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; Mpeg1Context *s = avctx->priv_data; AVFrame *picture = data; MpegEncContext *s2 = &s->mpeg_enc_ctx; Modified: trunk/libavcodec/mpegaudiodec.c ============================================================================== --- trunk/libavcodec/mpegaudiodec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/mpegaudiodec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -2258,8 +2258,10 @@ static int mp_decode_frame(MPADecodeCont static int decode_frame(AVCodecContext * avctx, void *data, int *data_size, - const uint8_t * buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MPADecodeContext *s = avctx->priv_data; uint32_t header; int out_size; @@ -2315,8 +2317,10 @@ static void flush(AVCodecContext *avctx) #if CONFIG_MP3ADU_DECODER static int decode_frame_adu(AVCodecContext * avctx, void *data, int *data_size, - const uint8_t * buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MPADecodeContext *s = avctx->priv_data; uint32_t header; int len, out_size; @@ -2459,8 +2463,10 @@ static av_cold int decode_close_mp3on4(A static int decode_frame_mp3on4(AVCodecContext * avctx, void *data, int *data_size, - const uint8_t * buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MP3On4DecodeContext *s = avctx->priv_data; MPADecodeContext *m; int fsize, len = buf_size, out_size = 0; Modified: trunk/libavcodec/mpegvideo.h ============================================================================== --- trunk/libavcodec/mpegvideo.h Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/mpegvideo.h Tue Apr 7 17:59:50 2009 (r18351) @@ -795,7 +795,7 @@ int ff_h261_get_picture_format(int width int ff_h263_decode_init(AVCodecContext *avctx); int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size); + AVPacket *avpkt); int ff_h263_decode_end(AVCodecContext *avctx); void h263_encode_mb(MpegEncContext *s, DCTELEM block[6][64], Modified: trunk/libavcodec/msrle.c ============================================================================== --- trunk/libavcodec/msrle.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/msrle.c Tue Apr 7 17:59:50 2009 (r18351) @@ -63,8 +63,10 @@ static av_cold int msrle_decode_init(AVC static int msrle_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MsrleContext *s = avctx->priv_data; s->buf = buf; Modified: trunk/libavcodec/msvideo1.c ============================================================================== --- trunk/libavcodec/msvideo1.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/msvideo1.c Tue Apr 7 17:59:50 2009 (r18351) @@ -294,8 +294,10 @@ static void msvideo1_decode_16bit(Msvide static int msvideo1_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; Msvideo1Context *s = avctx->priv_data; s->buf = buf; Modified: trunk/libavcodec/nellymoserdec.c ============================================================================== --- trunk/libavcodec/nellymoserdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/nellymoserdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -153,7 +153,9 @@ static av_cold int decode_init(AVCodecCo static int decode_tag(AVCodecContext * avctx, void *data, int *data_size, - const uint8_t * buf, int buf_size) { + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; NellyMoserDecodeContext *s = avctx->priv_data; int blocks, i; int16_t* samples; Modified: trunk/libavcodec/nuv.c ============================================================================== --- trunk/libavcodec/nuv.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/nuv.c Tue Apr 7 17:59:50 2009 (r18351) @@ -128,7 +128,9 @@ static int codec_reinit(AVCodecContext * } static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) { + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; NuvContext *c = avctx->priv_data; AVFrame *picture = data; int orig_size = buf_size; Modified: trunk/libavcodec/pcm.c ============================================================================== --- trunk/libavcodec/pcm.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/pcm.c Tue Apr 7 17:59:50 2009 (r18351) @@ -323,8 +323,10 @@ static av_cold int pcm_decode_init(AVCod static int pcm_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; PCMDecode *s = avctx->priv_data; int sample_size, c, n; short *samples; Modified: trunk/libavcodec/pcx.c ============================================================================== --- trunk/libavcodec/pcx.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/pcx.c Tue Apr 7 17:59:50 2009 (r18351) @@ -70,7 +70,9 @@ static void pcx_palette(const uint8_t ** } static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) { + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; PCXContext * const s = avctx->priv_data; AVFrame *picture = data; AVFrame * const p = &s->picture; Modified: trunk/libavcodec/pngdec.c ============================================================================== --- trunk/libavcodec/pngdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/pngdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -379,8 +379,10 @@ static int png_decode_idat(PNGDecContext static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; PNGDecContext * const s = avctx->priv_data; AVFrame *picture = data; AVFrame * const p= &s->picture; Modified: trunk/libavcodec/pnmenc.c ============================================================================== --- trunk/libavcodec/pnmenc.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/pnmenc.c Tue Apr 7 17:59:50 2009 (r18351) @@ -34,8 +34,10 @@ static av_cold int common_init(AVCodecCo static int pnm_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; PNMContext * const s = avctx->priv_data; AVFrame *picture = data; AVFrame * const p= (AVFrame*)&s->picture; Modified: trunk/libavcodec/ptx.c ============================================================================== --- trunk/libavcodec/ptx.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/ptx.c Tue Apr 7 17:59:50 2009 (r18351) @@ -36,7 +36,9 @@ static av_cold int ptx_init(AVCodecConte } static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) { + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; PTXContext * const s = avctx->priv_data; AVFrame *picture = data; AVFrame * const p = &s->picture; Modified: trunk/libavcodec/qcelpdec.c ============================================================================== --- trunk/libavcodec/qcelpdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/qcelpdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -729,8 +729,10 @@ static void warn_insufficient_frame_qual } static int qcelp_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; QCELPContext *q = avctx->priv_data; float *outbuffer = data; int i; Modified: trunk/libavcodec/qdm2.c ============================================================================== --- trunk/libavcodec/qdm2.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/qdm2.c Tue Apr 7 17:59:50 2009 (r18351) @@ -1968,8 +1968,10 @@ static void qdm2_decode (QDM2Context *q, static int qdm2_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; QDM2Context *s = avctx->priv_data; if(!buf) Modified: trunk/libavcodec/qdrw.c ============================================================================== --- trunk/libavcodec/qdrw.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/qdrw.c Tue Apr 7 17:59:50 2009 (r18351) @@ -34,8 +34,10 @@ typedef struct QdrawContext{ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; QdrawContext * const a = avctx->priv_data; AVFrame * const p= (AVFrame*)&a->pic; uint8_t* outdata; Modified: trunk/libavcodec/qpeg.c ============================================================================== --- trunk/libavcodec/qpeg.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/qpeg.c Tue Apr 7 17:59:50 2009 (r18351) @@ -248,8 +248,10 @@ static void qpeg_decode_inter(const uint static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; QpegContext * const a = avctx->priv_data; AVFrame * const p= (AVFrame*)&a->pic; uint8_t* outdata; Modified: trunk/libavcodec/qtrle.c ============================================================================== --- trunk/libavcodec/qtrle.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/qtrle.c Tue Apr 7 17:59:50 2009 (r18351) @@ -424,8 +424,10 @@ static av_cold int qtrle_decode_init(AVC static int qtrle_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; QtrleContext *s = avctx->priv_data; int header, start_line; int stream_ptr, height, row_ptr; Modified: trunk/libavcodec/ra144.c ============================================================================== --- trunk/libavcodec/ra144.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/ra144.c Tue Apr 7 17:59:50 2009 (r18351) @@ -287,8 +287,10 @@ static int interp(RA144Context *ractx, i /** Uncompress one block (20 bytes -> 160*2 bytes). */ static int ra144_decode_frame(AVCodecContext * avctx, void *vdata, - int *data_size, const uint8_t *buf, int buf_size) + int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; static const uint8_t sizes[10] = {6, 5, 5, 4, 4, 3, 3, 3, 3, 2}; unsigned int refl_rms[4]; // RMS of the reflection coefficients uint16_t block_coefs[4][30]; // LPC coefficients of each sub-block Modified: trunk/libavcodec/ra288.c ============================================================================== --- trunk/libavcodec/ra288.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/ra288.c Tue Apr 7 17:59:50 2009 (r18351) @@ -160,9 +160,10 @@ static void backward_filter(float *hist, } static int ra288_decode_frame(AVCodecContext * avctx, void *data, - int *data_size, const uint8_t * buf, - int buf_size) + int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; float *out = data; int i, j; RA288Context *ractx = avctx->priv_data; Modified: trunk/libavcodec/rawdec.c ============================================================================== --- trunk/libavcodec/rawdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/rawdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -100,8 +100,10 @@ static void flip(AVCodecContext *avctx, static int raw_decode(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; RawVideoContext *context = avctx->priv_data; AVFrame * frame = (AVFrame *) data; Modified: trunk/libavcodec/rl2.c ============================================================================== --- trunk/libavcodec/rl2.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/rl2.c Tue Apr 7 17:59:50 2009 (r18351) @@ -181,8 +181,10 @@ static av_cold int rl2_decode_init(AVCod */ static int rl2_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; Rl2Context *s = avctx->priv_data; if(s->frame.data[0]) Modified: trunk/libavcodec/roqvideodec.c ============================================================================== --- trunk/libavcodec/roqvideodec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/roqvideodec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -169,8 +169,10 @@ static av_cold int roq_decode_init(AVCod static int roq_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; RoqContext *s = avctx->priv_data; int copy= !s->current_frame->data[0]; Modified: trunk/libavcodec/rpza.c ============================================================================== --- trunk/libavcodec/rpza.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/rpza.c Tue Apr 7 17:59:50 2009 (r18351) @@ -241,8 +241,10 @@ static av_cold int rpza_decode_init(AVCo static int rpza_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; RpzaContext *s = avctx->priv_data; s->buf = buf; Modified: trunk/libavcodec/rv10.c ============================================================================== --- trunk/libavcodec/rv10.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/rv10.c Tue Apr 7 17:59:50 2009 (r18351) @@ -727,8 +727,10 @@ static int get_slice_offset(AVCodecConte static int rv10_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MpegEncContext *s = avctx->priv_data; int i; AVFrame *pict = data; Modified: trunk/libavcodec/rv34.c ============================================================================== --- trunk/libavcodec/rv34.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/rv34.c Tue Apr 7 17:59:50 2009 (r18351) @@ -1370,8 +1370,10 @@ static int get_slice_offset(AVCodecConte int ff_rv34_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; RV34DecContext *r = avctx->priv_data; MpegEncContext *s = &r->s; AVFrame *pict = data; Modified: trunk/libavcodec/rv34.h ============================================================================== --- trunk/libavcodec/rv34.h Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/rv34.h Tue Apr 7 17:59:50 2009 (r18351) @@ -123,7 +123,7 @@ typedef struct RV34DecContext{ */ int ff_rv34_get_start_offset(GetBitContext *gb, int blocks); int ff_rv34_decode_init(AVCodecContext *avctx); -int ff_rv34_decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size); +int ff_rv34_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt); int ff_rv34_decode_end(AVCodecContext *avctx); #endif /* AVCODEC_RV34_H */ Modified: trunk/libavcodec/sgidec.c ============================================================================== --- trunk/libavcodec/sgidec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/sgidec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -147,8 +147,10 @@ static int read_uncompressed_sgi(unsigne static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *in_buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *in_buf = avpkt->data; + int buf_size = avpkt->size; SgiState *s = avctx->priv_data; AVFrame *picture = data; AVFrame *p = &s->picture; Modified: trunk/libavcodec/shorten.c ============================================================================== --- trunk/libavcodec/shorten.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/shorten.c Tue Apr 7 17:59:50 2009 (r18351) @@ -269,8 +269,10 @@ static void decode_subframe_lpc(ShortenC static int shorten_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; ShortenContext *s = avctx->priv_data; int i, input_buf_size = 0; int16_t *samples = data; Modified: trunk/libavcodec/smacker.c ============================================================================== --- trunk/libavcodec/smacker.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/smacker.c Tue Apr 7 17:59:50 2009 (r18351) @@ -345,8 +345,10 @@ static av_always_inline int smk_get_code return v; } -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size) +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; SmackVContext * const smk = avctx->priv_data; uint8_t *out; uint32_t *pal; @@ -565,8 +567,10 @@ static av_cold int smka_decode_init(AVCo /** * Decode Smacker audio data */ -static int smka_decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size) +static int smka_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; GetBitContext gb; HuffContext h[4]; VLC vlc[4]; Modified: trunk/libavcodec/smc.c ============================================================================== --- trunk/libavcodec/smc.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/smc.c Tue Apr 7 17:59:50 2009 (r18351) @@ -441,8 +441,10 @@ static av_cold int smc_decode_init(AVCod static int smc_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; SmcContext *s = avctx->priv_data; s->buf = buf; Modified: trunk/libavcodec/snow.c ============================================================================== --- trunk/libavcodec/snow.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/snow.c Tue Apr 7 17:59:50 2009 (r18351) @@ -4483,7 +4483,9 @@ static av_cold int decode_init(AVCodecCo return 0; } -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size){ +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt){ + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; SnowContext *s = avctx->priv_data; RangeCoder * const c= &s->c; int bytes_read; Modified: trunk/libavcodec/sonic.c ============================================================================== --- trunk/libavcodec/sonic.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/sonic.c Tue Apr 7 17:59:50 2009 (r18351) @@ -851,8 +851,10 @@ static av_cold int sonic_decode_close(AV static int sonic_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; SonicContext *s = avctx->priv_data; GetBitContext gb; int i, quant, ch, j; Modified: trunk/libavcodec/sp5xdec.c ============================================================================== --- trunk/libavcodec/sp5xdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/sp5xdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -32,8 +32,11 @@ static int sp5x_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + AVPacket avpkt_recoded; #if 0 MJpegDecodeContext *s = avctx->priv_data; #endif @@ -89,7 +92,10 @@ static int sp5x_decode_frame(AVCodecCont recoded[j++] = 0xD9; avctx->flags &= ~CODEC_FLAG_EMU_EDGE; - i = ff_mjpeg_decode_frame(avctx, data, data_size, recoded, j); + av_init_packet(&avpkt_recoded); + avpkt_recoded.data = recoded; + avpkt_recoded.size = j; + i = ff_mjpeg_decode_frame(avctx, data, data_size, &avpkt_recoded); av_free(recoded); Modified: trunk/libavcodec/sunrast.c ============================================================================== --- trunk/libavcodec/sunrast.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/sunrast.c Tue Apr 7 17:59:50 2009 (r18351) @@ -43,7 +43,9 @@ static av_cold int sunrast_init(AVCodecC } static int sunrast_decode_frame(AVCodecContext *avctx, void *data, - int *data_size, const uint8_t *buf, int buf_size) { + int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; SUNRASTContext * const s = avctx->priv_data; AVFrame *picture = data; AVFrame * const p = &s->picture; Modified: trunk/libavcodec/svq1dec.c ============================================================================== --- trunk/libavcodec/svq1dec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/svq1dec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -642,8 +642,10 @@ static int svq1_decode_frame_header (Get static int svq1_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MpegEncContext *s=avctx->priv_data; uint8_t *current, *previous; int result, i, x, y, width, height; Modified: trunk/libavcodec/svq3.c ============================================================================== --- trunk/libavcodec/svq3.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/svq3.c Tue Apr 7 17:59:50 2009 (r18351) @@ -889,8 +889,10 @@ static av_cold int svq3_decode_init(AVCo static int svq3_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MpegEncContext *const s = avctx->priv_data; H264Context *const h = avctx->priv_data; int m, mb_type; Modified: trunk/libavcodec/targa.c ============================================================================== --- trunk/libavcodec/targa.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/targa.c Tue Apr 7 17:59:50 2009 (r18351) @@ -91,8 +91,10 @@ static void targa_decode_rle(AVCodecCont static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; TargaContext * const s = avctx->priv_data; AVFrame *picture = data; AVFrame * const p= (AVFrame*)&s->picture; Modified: trunk/libavcodec/tiertexseqv.c ============================================================================== --- trunk/libavcodec/tiertexseqv.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/tiertexseqv.c Tue Apr 7 17:59:50 2009 (r18351) @@ -187,8 +187,10 @@ static av_cold int seqvideo_decode_init( static int seqvideo_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; SeqVideoContext *seq = avctx->priv_data; Modified: trunk/libavcodec/tiff.c ============================================================================== --- trunk/libavcodec/tiff.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/tiff.c Tue Apr 7 17:59:50 2009 (r18351) @@ -404,8 +404,10 @@ static int tiff_decode_tag(TiffContext * static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; TiffContext * const s = avctx->priv_data; AVFrame *picture = data; AVFrame * const p= (AVFrame*)&s->picture; Modified: trunk/libavcodec/truemotion1.c ============================================================================== --- trunk/libavcodec/truemotion1.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/truemotion1.c Tue Apr 7 17:59:50 2009 (r18351) @@ -846,8 +846,10 @@ static void truemotion1_decode_24bit(Tru static int truemotion1_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; TrueMotion1Context *s = avctx->priv_data; s->buf = buf; Modified: trunk/libavcodec/truemotion2.c ============================================================================== --- trunk/libavcodec/truemotion2.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/truemotion2.c Tue Apr 7 17:59:50 2009 (r18351) @@ -763,8 +763,10 @@ static const int tm2_stream_order[TM2_NU static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; TM2Context * const l = avctx->priv_data; AVFrame * const p= (AVFrame*)&l->pic; int i, skip, t; Modified: trunk/libavcodec/truespeech.c ============================================================================== --- trunk/libavcodec/truespeech.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/truespeech.c Tue Apr 7 17:59:50 2009 (r18351) @@ -332,8 +332,10 @@ static void truespeech_save_prevvec(TSCo static int truespeech_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; TSContext *c = avctx->priv_data; int i, j; Modified: trunk/libavcodec/tscc.c ============================================================================== --- trunk/libavcodec/tscc.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/tscc.c Tue Apr 7 17:59:50 2009 (r18351) @@ -67,8 +67,10 @@ typedef struct TsccContext { * Decode a frame * */ -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size) +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; CamtasiaContext * const c = avctx->priv_data; const unsigned char *encoded = buf; unsigned char *outptr; Modified: trunk/libavcodec/tta.c ============================================================================== --- trunk/libavcodec/tta.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/tta.c Tue Apr 7 17:59:50 2009 (r18351) @@ -287,8 +287,10 @@ static av_cold int tta_decode_init(AVCod static int tta_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; TTAContext *s = avctx->priv_data; int i; Modified: trunk/libavcodec/txd.c ============================================================================== --- trunk/libavcodec/txd.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/txd.c Tue Apr 7 17:59:50 2009 (r18351) @@ -39,7 +39,9 @@ static av_cold int txd_init(AVCodecConte } static int txd_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) { + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; TXDContext * const s = avctx->priv_data; AVFrame *picture = data; AVFrame * const p = &s->picture; Modified: trunk/libavcodec/ulti.c ============================================================================== --- trunk/libavcodec/ulti.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/ulti.c Tue Apr 7 17:59:50 2009 (r18351) @@ -200,8 +200,10 @@ static void ulti_grad(AVFrame *frame, in static int ulti_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; UltimotionDecodeContext *s=avctx->priv_data; int modifier = 0; int uniq = 0; Modified: trunk/libavcodec/utils.c ============================================================================== --- trunk/libavcodec/utils.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/utils.c Tue Apr 7 17:59:50 2009 (r18351) @@ -524,18 +524,32 @@ int avcodec_encode_subtitle(AVCodecConte return ret; } +#if LIBAVCODEC_VERSION_MAJOR < 53 int attribute_align_arg avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture, int *got_picture_ptr, const uint8_t *buf, int buf_size) { + AVPacket avpkt; + av_init_packet(&avpkt); + avpkt.data = buf; + avpkt.size = buf_size; + + return avcodec_decode_video2(avctx, picture, got_picture_ptr, &avpkt); +} +#endif + +int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, + int *got_picture_ptr, + AVPacket *avpkt) +{ int ret; *got_picture_ptr= 0; if((avctx->coded_width||avctx->coded_height) && avcodec_check_dimensions(avctx,avctx->coded_width,avctx->coded_height)) return -1; - if((avctx->codec->capabilities & CODEC_CAP_DELAY) || buf_size){ + if((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size){ ret = avctx->codec->decode(avctx, picture, got_picture_ptr, - buf, buf_size); + avpkt); emms_c(); //needed to avoid an emms_c() call before every return; @@ -547,13 +561,27 @@ int attribute_align_arg avcodec_decode_v return ret; } +#if LIBAVCODEC_VERSION_MAJOR < 53 int attribute_align_arg avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, const uint8_t *buf, int buf_size) { + AVPacket avpkt; + av_init_packet(&avpkt); + avpkt.data = buf; + avpkt.size = buf_size; + + return avcodec_decode_audio3(avctx, samples, frame_size_ptr, &avpkt); +} +#endif + +int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples, + int *frame_size_ptr, + AVPacket *avpkt) +{ int ret; - if((avctx->codec->capabilities & CODEC_CAP_DELAY) || buf_size){ + if((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size){ //FIXME remove the check below _after_ ensuring that all audio check that the available space is enough if(*frame_size_ptr < AVCODEC_MAX_AUDIO_FRAME_SIZE){ av_log(avctx, AV_LOG_ERROR, "buffer smaller than AVCODEC_MAX_AUDIO_FRAME_SIZE\n"); @@ -565,8 +593,7 @@ int attribute_align_arg avcodec_decode_a return -1; } - ret = avctx->codec->decode(avctx, samples, frame_size_ptr, - buf, buf_size); + ret = avctx->codec->decode(avctx, samples, frame_size_ptr, avpkt); avctx->frame_number++; }else{ ret= 0; @@ -575,15 +602,28 @@ int attribute_align_arg avcodec_decode_a return ret; } +#if LIBAVCODEC_VERSION_MAJOR < 53 int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub, int *got_sub_ptr, const uint8_t *buf, int buf_size) { + AVPacket avpkt; + av_init_packet(&avpkt); + avpkt.data = buf; + avpkt.size = buf_size; + + return avcodec_decode_subtitle2(avctx, sub, got_sub_ptr, &avpkt); +} +#endif + +int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, + int *got_sub_ptr, + AVPacket *avpkt) +{ int ret; *got_sub_ptr = 0; - ret = avctx->codec->decode(avctx, sub, got_sub_ptr, - buf, buf_size); + ret = avctx->codec->decode(avctx, sub, got_sub_ptr, avpkt); if (*got_sub_ptr) avctx->frame_number++; return ret; Modified: trunk/libavcodec/vb.c ============================================================================== --- trunk/libavcodec/vb.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/vb.c Tue Apr 7 17:59:50 2009 (r18351) @@ -173,8 +173,10 @@ static int vb_decode_framedata(VBDecCont return 0; } -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size) +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; VBDecContext * const c = avctx->priv_data; uint8_t *outptr, *srcptr; int i, j; Modified: trunk/libavcodec/vc1.c ============================================================================== --- trunk/libavcodec/vc1.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/vc1.c Tue Apr 7 17:59:50 2009 (r18351) @@ -4136,8 +4136,10 @@ static av_cold int vc1_decode_init(AVCod */ static int vc1_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; VC1Context *v = avctx->priv_data; MpegEncContext *s = &v->s; AVFrame *pict = data; Modified: trunk/libavcodec/vcr1.c ============================================================================== --- trunk/libavcodec/vcr1.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/vcr1.c Tue Apr 7 17:59:50 2009 (r18351) @@ -43,8 +43,10 @@ typedef struct VCR1Context{ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; VCR1Context * const a = avctx->priv_data; AVFrame *picture = data; AVFrame * const p= (AVFrame*)&a->picture; Modified: trunk/libavcodec/vmdav.c ============================================================================== --- trunk/libavcodec/vmdav.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/vmdav.c Tue Apr 7 17:59:50 2009 (r18351) @@ -366,8 +366,10 @@ static av_cold int vmdvideo_decode_init( static int vmdvideo_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; VmdVideoContext *s = avctx->priv_data; s->buf = buf; @@ -521,8 +523,10 @@ static int vmdaudio_loadsound(VmdAudioCo static int vmdaudio_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; VmdAudioContext *s = avctx->priv_data; unsigned char *output_samples = (unsigned char *)data; Modified: trunk/libavcodec/vmnc.c ============================================================================== --- trunk/libavcodec/vmnc.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/vmnc.c Tue Apr 7 17:59:50 2009 (r18351) @@ -284,8 +284,10 @@ static int decode_hextile(VmncContext *c return src - ssrc; } -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size) +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; VmncContext * const c = avctx->priv_data; uint8_t *outptr; const uint8_t *src = buf; Modified: trunk/libavcodec/vorbis_dec.c ============================================================================== --- trunk/libavcodec/vorbis_dec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/vorbis_dec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -1560,8 +1560,10 @@ static int vorbis_parse_audio_packet(vor static int vorbis_decode_frame(AVCodecContext *avccontext, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; vorbis_context *vc = avccontext->priv_data ; GetBitContext *gb = &(vc->gb); const float *channel_ptrs[vc->audio_channels]; Modified: trunk/libavcodec/vp3.c ============================================================================== --- trunk/libavcodec/vp3.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/vp3.c Tue Apr 7 17:59:50 2009 (r18351) @@ -1800,8 +1800,10 @@ static av_cold int vp3_decode_init(AVCod */ static int vp3_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; Vp3DecodeContext *s = avctx->priv_data; GetBitContext gb; static int counter = 0; Modified: trunk/libavcodec/vqavideo.c ============================================================================== --- trunk/libavcodec/vqavideo.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/vqavideo.c Tue Apr 7 17:59:50 2009 (r18351) @@ -565,8 +565,10 @@ static void vqa_decode_chunk(VqaContext static int vqa_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; VqaContext *s = avctx->priv_data; s->buf = buf; Modified: trunk/libavcodec/wavpack.c ============================================================================== --- trunk/libavcodec/wavpack.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/wavpack.c Tue Apr 7 17:59:50 2009 (r18351) @@ -476,8 +476,10 @@ static av_cold int wavpack_decode_init(A static int wavpack_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; WavpackContext *s = avctx->priv_data; int16_t *samples = data; int samplecount; Modified: trunk/libavcodec/wmadec.c ============================================================================== --- trunk/libavcodec/wmadec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/wmadec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -752,8 +752,10 @@ static int wma_decode_frame(WMACodecCont static int wma_decode_superframe(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; WMACodecContext *s = avctx->priv_data; int nb_frames, bit_offset, i, pos, len; uint8_t *q; Modified: trunk/libavcodec/wnv1.c ============================================================================== --- trunk/libavcodec/wnv1.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/wnv1.c Tue Apr 7 17:59:50 2009 (r18351) @@ -58,8 +58,10 @@ static inline int wnv1_get_code(WNV1Cont static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; WNV1Context * const l = avctx->priv_data; AVFrame * const p= (AVFrame*)&l->pic; unsigned char *Y,*U,*V; Modified: trunk/libavcodec/ws-snd1.c ============================================================================== --- trunk/libavcodec/ws-snd1.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/ws-snd1.c Tue Apr 7 17:59:50 2009 (r18351) @@ -48,8 +48,10 @@ static av_cold int ws_snd_decode_init(AV static int ws_snd_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; // WSSNDContext *c = avctx->priv_data; int in_size, out_size; Modified: trunk/libavcodec/xan.c ============================================================================== --- trunk/libavcodec/xan.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/xan.c Tue Apr 7 17:59:50 2009 (r18351) @@ -405,8 +405,10 @@ static void xan_wc4_decode_frame(XanCont static int xan_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; XanContext *s = avctx->priv_data; AVPaletteControl *palette_control = avctx->palctrl; Modified: trunk/libavcodec/xl.c ============================================================================== --- trunk/libavcodec/xl.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/xl.c Tue Apr 7 17:59:50 2009 (r18351) @@ -40,8 +40,10 @@ static const int xl_table[32] = { static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; VideoXLContext * const a = avctx->priv_data; AVFrame * const p= (AVFrame*)&a->pic; uint8_t *Y, *U, *V; Modified: trunk/libavcodec/xsubdec.c ============================================================================== --- trunk/libavcodec/xsubdec.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/xsubdec.c Tue Apr 7 17:59:50 2009 (r18351) @@ -44,7 +44,9 @@ static uint64_t parse_timecode(const uin } static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) { + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; AVSubtitle *sub = data; const uint8_t *buf_end = buf + buf_size; uint8_t *bitmap; Modified: trunk/libavcodec/zmbv.c ============================================================================== --- trunk/libavcodec/zmbv.c Tue Apr 7 17:37:26 2009 (r18350) +++ trunk/libavcodec/zmbv.c Tue Apr 7 17:59:50 2009 (r18351) @@ -392,8 +392,10 @@ static int zmbv_decode_intra(ZmbvContext return 0; } -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size) +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; ZmbvContext * const c = avctx->priv_data; uint8_t *outptr; int zret = Z_OK; // Zlib return code

8 16

r18406 - in trunk/libavcodec: h264.c h264.h h264_parser.c
by subversion＠mplayerhq.hu 09 Jul '10

09 Jul '10

Author: reimar Date: Fri Apr 10 09:01:55 2009 New Revision: 18406 Log: Add a ff_h264_free_context function and call it from the H.264 parser. This ensures that the parser will no longer leak memory for all SPS/PPS it encounters. Modified: trunk/libavcodec/h264.c trunk/libavcodec/h264.h trunk/libavcodec/h264_parser.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c Fri Apr 10 02:09:07 2009 (r18405) +++ trunk/libavcodec/h264.c Fri Apr 10 09:01:55 2009 (r18406) @@ -8083,10 +8083,8 @@ int main(void){ #endif /* TEST */ -static av_cold int decode_end(AVCodecContext *avctx) +av_cold ff_h264_free_context(H264Context *h) { - H264Context *h = avctx->priv_data; - MpegEncContext *s = &h->s; int i; av_freep(&h->rbsp_buffer[0]); @@ -8098,6 +8096,14 @@ static av_cold int decode_end(AVCodecCon for(i = 0; i < MAX_PPS_COUNT; i++) av_freep(h->pps_buffers + i); +} + +static av_cold int decode_end(AVCodecContext *avctx) +{ + H264Context *h = avctx->priv_data; + MpegEncContext *s = &h->s; + + ff_h264_free_context(h); MPV_common_end(s); Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Fri Apr 10 02:09:07 2009 (r18405) +++ trunk/libavcodec/h264.h Fri Apr 10 09:01:55 2009 (r18406) @@ -569,4 +569,9 @@ const uint8_t *ff_h264_decode_nal(H264Co */ int ff_h264_decode_rbsp_trailing(H264Context *h, const uint8_t *src); +/** + * frees any data that may have been allocated in the H264 context like SPS, PPS etc. + */ +av_cold ff_h264_free_context(H264Context *h); + #endif /* AVCODEC_H264_H */ Modified: trunk/libavcodec/h264_parser.c ============================================================================== --- trunk/libavcodec/h264_parser.c Fri Apr 10 02:09:07 2009 (r18405) +++ trunk/libavcodec/h264_parser.c Fri Apr 10 09:01:55 2009 (r18406) @@ -306,6 +306,7 @@ static void close(AVCodecParserContext * ParseContext *pc = &h->s.parse_context; av_free(pc->buffer); + ff_h264_free_context(h); }

4 7

r21854 - in trunk/libavutil: pixdesc.c pixdesc.h
by subversion＠mplayerhq.hu 07 Jul '10

07 Jul '10

Author: stefano Date: Tue Feb 16 21:17:50 2010 New Revision: 21854 Log: Move read_line() and write_line() definition from pixdesc.h to pixdesc.c, which are now not anymore marked as static inline. Fix the inclusion of the private header intreadwrite.h in the public header pixdesc.h. Modified: trunk/libavutil/pixdesc.c trunk/libavutil/pixdesc.h Modified: trunk/libavutil/pixdesc.c ============================================================================== --- trunk/libavutil/pixdesc.c Tue Feb 16 20:26:49 2010 (r21853) +++ trunk/libavutil/pixdesc.c Tue Feb 16 21:17:50 2010 (r21854) @@ -22,6 +22,86 @@ #include "pixfmt.h" #include "pixdesc.h" +#include "intreadwrite.h" + +void read_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4], + const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component) +{ + AVComponentDescriptor comp= desc->comp[c]; + int plane= comp.plane; + int depth= comp.depth_minus1+1; + int mask = (1<<depth)-1; + int shift= comp.shift; + int step = comp.step_minus1+1; + int flags= desc->flags; + + if (flags & PIX_FMT_BITSTREAM){ + int skip = x*step + comp.offset_plus1-1; + const uint8_t *p = data[plane] + y*linesize[plane] + (skip>>3); + int shift = 8 - depth - (skip&7); + + while(w--){ + int val = (*p >> shift) & mask; + if(read_pal_component) + val= data[1][4*val + c]; + shift -= step; + p -= shift>>3; + shift &= 7; + *dst++= val; + } + } else { + const uint8_t *p = data[plane]+ y*linesize[plane] + x*step + comp.offset_plus1-1; + + while(w--){ + int val; + if(flags & PIX_FMT_BE) val= AV_RB16(p); + else val= AV_RL16(p); + val = (val>>shift) & mask; + if(read_pal_component) + val= data[1][4*val + c]; + p+= step; + *dst++= val; + } + } +} + +void write_line(const uint16_t *src, uint8_t *data[4], const int linesize[4], + const AVPixFmtDescriptor *desc, int x, int y, int c, int w) +{ + AVComponentDescriptor comp = desc->comp[c]; + int plane = comp.plane; + int depth = comp.depth_minus1+1; + int step = comp.step_minus1+1; + int flags = desc->flags; + + if (flags & PIX_FMT_BITSTREAM) { + int skip = x*step + comp.offset_plus1-1; + uint8_t *p = data[plane] + y*linesize[plane] + (skip>>3); + int shift = 8 - depth - (skip&7); + + while (w--) { + *p |= *src++ << shift; + shift -= step; + p -= shift>>3; + shift &= 7; + } + } else { + int shift = comp.shift; + uint8_t *p = data[plane]+ y*linesize[plane] + x*step + comp.offset_plus1-1; + + while (w--) { + if (flags & PIX_FMT_BE) { + uint16_t val = AV_RB16(p) | (*src++<<shift); + AV_WB16(p, val); + } else { + uint16_t val = AV_RL16(p) | (*src++<<shift); + AV_WL16(p, val); + } + p+= step; + } + } +} + const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { [PIX_FMT_YUV420P] = { .name = "yuv420p", Modified: trunk/libavutil/pixdesc.h ============================================================================== --- trunk/libavutil/pixdesc.h Tue Feb 16 20:26:49 2010 (r21853) +++ trunk/libavutil/pixdesc.h Tue Feb 16 21:17:50 2010 (r21854) @@ -24,8 +24,6 @@ #include <inttypes.h> -#include "intreadwrite.h" - typedef struct AVComponentDescriptor{ uint16_t plane :2; ///< which of the 4 planes contains the component @@ -110,46 +108,8 @@ extern const AVPixFmtDescriptor av_pix_f * component c in data[1] to dst, rather than the palette indexes in * data[0]. The behavior is undefined if the format is not paletted. */ -static inline void read_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4], - const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component) -{ - AVComponentDescriptor comp= desc->comp[c]; - int plane= comp.plane; - int depth= comp.depth_minus1+1; - int mask = (1<<depth)-1; - int shift= comp.shift; - int step = comp.step_minus1+1; - int flags= desc->flags; - - if (flags & PIX_FMT_BITSTREAM){ - int skip = x*step + comp.offset_plus1-1; - const uint8_t *p = data[plane] + y*linesize[plane] + (skip>>3); - int shift = 8 - depth - (skip&7); - - while(w--){ - int val = (*p >> shift) & mask; - if(read_pal_component) - val= data[1][4*val + c]; - shift -= step; - p -= shift>>3; - shift &= 7; - *dst++= val; - } - } else { - const uint8_t *p = data[plane]+ y*linesize[plane] + x*step + comp.offset_plus1-1; - - while(w--){ - int val; - if(flags & PIX_FMT_BE) val= AV_RB16(p); - else val= AV_RL16(p); - val = (val>>shift) & mask; - if(read_pal_component) - val= data[1][4*val + c]; - p+= step; - *dst++= val; - } - } -} +void read_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4], + const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component); /** * Writes the values from src to the pixel format component c of an @@ -165,42 +125,8 @@ static inline void read_line(uint16_t *d * @param w the width of the line to write, that is the number of * values to write to the image line */ -static inline void write_line(const uint16_t *src, uint8_t *data[4], const int linesize[4], - const AVPixFmtDescriptor *desc, int x, int y, int c, int w) -{ - AVComponentDescriptor comp = desc->comp[c]; - int plane = comp.plane; - int depth = comp.depth_minus1+1; - int step = comp.step_minus1+1; - int flags = desc->flags; - - if (flags & PIX_FMT_BITSTREAM) { - int skip = x*step + comp.offset_plus1-1; - uint8_t *p = data[plane] + y*linesize[plane] + (skip>>3); - int shift = 8 - depth - (skip&7); - - while (w--) { - *p |= *src++ << shift; - shift -= step; - p -= shift>>3; - shift &= 7; - } - } else { - int shift = comp.shift; - uint8_t *p = data[plane]+ y*linesize[plane] + x*step + comp.offset_plus1-1; - - while (w--) { - if (flags & PIX_FMT_BE) { - uint16_t val = AV_RB16(p) | (*src++<<shift); - AV_WB16(p, val); - } else { - uint16_t val = AV_RL16(p) | (*src++<<shift); - AV_WL16(p, val); - } - p+= step; - } - } -} +void write_line(const uint16_t *src, uint8_t *data[4], const int linesize[4], + const AVPixFmtDescriptor *desc, int x, int y, int c, int w); /** * Returns the pixel format corresponding to name.

3 4

r23799 - branches/0.6-aac-he-v2
by subversion＠mplayerhq.hu 07 Jul '10

07 Jul '10

Author: siretart Date: Sat Jun 26 17:26:35 2010 New Revision: 23799 Log: create test branch for AAC-HE v2 backport for 0.6 Added: branches/0.6-aac-he-v2/ (props changed) - copied from r23798, branches/0.6/

4 4

r23904 - in trunk: cmdutils.h libavcodec/aac_parser.h libavcodec/ac3.c libavcodec/ac3.h libavcodec/ac3_parser.h libavcodec/ac3tab.c libavcodec/allcodecs.c libavcodec/alsdec.c libavcodec/avcodec.h l...
by subversion＠mplayerhq.hu 03 Jul '10

03 Jul '10

Author: mru Date: Wed Jun 30 17:38:06 2010 New Revision: 23904 Log: Fix grammar errors in documentation Modified: trunk/cmdutils.h trunk/libavcodec/aac_parser.h trunk/libavcodec/ac3.c trunk/libavcodec/ac3.h trunk/libavcodec/ac3_parser.h trunk/libavcodec/ac3tab.c trunk/libavcodec/allcodecs.c trunk/libavcodec/alsdec.c trunk/libavcodec/avcodec.h trunk/libavcodec/avfft.h trunk/libavcodec/bgmc.c trunk/libavcodec/bink.c trunk/libavcodec/cavsdata.h trunk/libavcodec/celp_math.h trunk/libavcodec/dirac.h trunk/libavcodec/dirac_parser.c trunk/libavcodec/dsputil.c trunk/libavcodec/fft.h trunk/libavcodec/flacenc.c trunk/libavcodec/h261enc.c trunk/libavcodec/h263.h trunk/libavcodec/h264.c trunk/libavcodec/h264.h trunk/libavcodec/h264pred.c trunk/libavcodec/idcinvideo.c trunk/libavcodec/iff.c trunk/libavcodec/indeo5.c trunk/libavcodec/internal.h trunk/libavcodec/ituh263enc.c trunk/libavcodec/ivi_common.c trunk/libavcodec/ivi_common.h trunk/libavcodec/ivi_dsp.h trunk/libavcodec/libtheoraenc.c trunk/libavcodec/libxvidff.c trunk/libavcodec/lpc.c trunk/libavcodec/lpc.h trunk/libavcodec/lsp.h trunk/libavcodec/mlpdec.c trunk/libavcodec/mpeg12.c trunk/libavcodec/mpeg4videoenc.c trunk/libavcodec/mpegvideo.c trunk/libavcodec/mpegvideo_xvmc.c trunk/libavcodec/msrledec.h trunk/libavcodec/nellymoserenc.c trunk/libavcodec/opt.h trunk/libavcodec/parser.h trunk/libavcodec/pgssubdec.c trunk/libavcodec/ppc/check_altivec.c trunk/libavcodec/put_bits.h trunk/libavcodec/qcelpdec.c trunk/libavcodec/qdm2.c trunk/libavcodec/qtrleenc.c trunk/libavcodec/ra144enc.c trunk/libavcodec/roqvideoenc.c trunk/libavcodec/sipr.c trunk/libavcodec/twinvq.c trunk/libavcodec/utils.c trunk/libavcodec/vaapi_h264.c trunk/libavcodec/vaapi_vc1.c trunk/libavcodec/vp3.c trunk/libavcodec/wmavoice.c trunk/libavcodec/x86/vc1dsp_mmx.c trunk/libavcodec/xiph.h trunk/libavcodec/xsubenc.c trunk/libavcodec/xvmc.h trunk/libavcodec/yop.c trunk/libavdevice/alsa-audio.h trunk/libavdevice/avdevice.h trunk/libavdevice/x11grab.c trunk/libavfilter/avfilter.h trunk/libavfilter/avfiltergraph.h trunk/libavfilter/graphparser.h trunk/libavfilter/parseutils.c trunk/libavfilter/parseutils.h trunk/libavformat/avformat.h trunk/libavformat/avio.h trunk/libavformat/avlanguage.h trunk/libavformat/http.h trunk/libavformat/id3v2.h trunk/libavformat/internal.h trunk/libavformat/librtmp.c trunk/libavformat/matroskaenc.c trunk/libavformat/mpeg.c trunk/libavformat/mpegts.c trunk/libavformat/nutenc.c trunk/libavformat/rtmppkt.h trunk/libavformat/rtmpproto.c trunk/libavformat/utils.c trunk/libavformat/vorbiscomment.h trunk/libavutil/aes.h trunk/libavutil/avutil.h trunk/libavutil/base64.h trunk/libavutil/common.h trunk/libavutil/crc.c trunk/libavutil/error.h trunk/libavutil/eval.h trunk/libavutil/fifo.h trunk/libavutil/integer.h trunk/libavutil/internal.h trunk/libavutil/lfg.h trunk/libavutil/log.h trunk/libavutil/mathematics.h trunk/libavutil/mem.h trunk/libavutil/pixdesc.h trunk/libavutil/random_seed.h trunk/libavutil/rational.h trunk/libavutil/sha.h trunk/libavutil/sha1.h trunk/libavutil/tree.h trunk/libpostproc/postprocess.h trunk/libpostproc/postprocess_template.c Modified: trunk/cmdutils.h ============================================================================== --- trunk/cmdutils.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/cmdutils.h Wed Jun 30 17:38:06 2010 (r23904) @@ -51,7 +51,7 @@ extern struct SwsContext *sws_opts; int opt_default(const char *opt, const char *arg); /** - * Sets the libav* libraries log level. + * Set the libav* libraries log level. */ int opt_loglevel(const char *opt, const char *arg); @@ -61,8 +61,8 @@ int opt_loglevel(const char *opt, const int opt_timelimit(const char *opt, const char *arg); /** - * Parses a string and returns its corresponding value as a double. - * Exits from the application if the string cannot be correctly + * Parse a string and return its corresponding value as a double. + * Exit from the application if the string cannot be correctly * parsed or the corresponding value is invalid. * * @param context the context of the value to be set (e.g. the @@ -76,8 +76,8 @@ int opt_timelimit(const char *opt, const double parse_number_or_die(const char *context, const char *numstr, int type, double min, double max); /** - * Parses a string specifying a time and returns its corresponding - * value as a number of microseconds. Exits from the application if + * Parse a string specifying a time and return its corresponding + * value as a number of microseconds. Exit from the application if * the string cannot be correctly parsed. * * @param context the context of the value to be set (e.g. the @@ -122,7 +122,7 @@ typedef struct { void show_help_options(const OptionDef *options, const char *msg, int mask, int value); /** - * Parses the command line arguments. + * Parse the command line arguments. * @param options Array with the definitions required to interpret every * option of the form: -<option_name> [<argument>] * @param parse_arg_function Name of the function called to process every @@ -135,7 +135,7 @@ void parse_options(int argc, char **argv void set_context_opts(void *ctx, void *opts_ctx, int flags); /** - * Prints an error message to stderr, indicating filename and a human + * Print an error message to stderr, indicating filename and a human * readable description of the error code err. * * If strerror_r() is not available the use of this function in a @@ -148,73 +148,73 @@ void print_error(const char *filename, i void list_fmts(void (*get_fmt_string)(char *buf, int buf_size, int fmt), int nb_fmts); /** - * Prints the program banner to stderr. The banner contents depend on the + * Print the program banner to stderr. The banner contents depend on the * current version of the repository and of the libav* libraries used by * the program. */ void show_banner(void); /** - * Prints the version of the program to stdout. The version message + * Print the version of the program to stdout. The version message * depends on the current versions of the repository and of the libav* * libraries. */ void show_version(void); /** - * Prints the license of the program to stdout. The license depends on + * Print the license of the program to stdout. The license depends on * the license of the libraries compiled into the program. */ void show_license(void); /** - * Prints a listing containing all the formats supported by the + * Print a listing containing all the formats supported by the * program. */ void show_formats(void); /** - * Prints a listing containing all the codecs supported by the + * Print a listing containing all the codecs supported by the * program. */ void show_codecs(void); /** - * Prints a listing containing all the filters supported by the + * Print a listing containing all the filters supported by the * program. */ void show_filters(void); /** - * Prints a listing containing all the bit stream filters supported by the + * Print a listing containing all the bit stream filters supported by the * program. */ void show_bsfs(void); /** - * Prints a listing containing all the protocols supported by the + * Print a listing containing all the protocols supported by the * program. */ void show_protocols(void); /** - * Prints a listing containing all the pixel formats supported by the + * Print a listing containing all the pixel formats supported by the * program. */ void show_pix_fmts(void); /** - * Returns a positive value if reads from standard input a line + * Return a positive value if reads from standard input a line * starting with [yY], otherwise returns 0. */ int read_yesno(void); /** - * Reads the file with name filename, and puts its content in a newly + * Read the file with name filename, and put its content in a newly * allocated 0-terminated buffer. * - * @param bufptr puts here the pointer to the newly allocated buffer - * @param size puts here the size of the newly allocated buffer + * @param bufptr location where pointer to buffer is returned + * @param size location where size of buffer is returned * @return 0 in case of success, a negative value corresponding to an * AVERROR error code in case of failure. */ Modified: trunk/libavcodec/aac_parser.h ============================================================================== --- trunk/libavcodec/aac_parser.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/aac_parser.h Wed Jun 30 17:38:06 2010 (r23904) @@ -41,8 +41,8 @@ typedef struct { } AACADTSHeaderInfo; /** - * Parses AAC frame header. - * Parses the ADTS frame header to the end of the variable header, which is + * Parse AAC frame header. + * Parse the ADTS frame header to the end of the variable header, which is * the first 54 bits. * @param gbc[in] BitContext containing the first 54 bits of the frame. * @param hdr[out] Pointer to struct where header info is written. Modified: trunk/libavcodec/ac3.c ============================================================================== --- trunk/libavcodec/ac3.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/ac3.c Wed Jun 30 17:38:06 2010 (r23904) @@ -42,7 +42,7 @@ static const uint8_t band_start_tab[51] }; /** - * Maps each frequency coefficient bin to the critical band that contains it. + * Map each frequency coefficient bin to the critical band that contains it. */ static const uint8_t bin_to_band_tab[253] = { 0, @@ -261,7 +261,7 @@ void ac3_parametric_bit_allocation(AC3Bi } /** - * Initializes some tables. + * Initialize some tables. * note: This function must remain thread safe because it is called by the * AVParser init code. */ Modified: trunk/libavcodec/ac3.h ============================================================================== --- trunk/libavcodec/ac3.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/ac3.h Wed Jun 30 17:38:06 2010 (r23904) @@ -114,7 +114,7 @@ typedef enum { void ac3_common_init(void); /** - * Calculates the log power-spectral density of the input signal. + * Calculate the log power-spectral density of the input signal. * This gives a rough estimate of signal power in the frequency domain by using * the spectral envelope (exponents). The psd is also separately grouped * into critical bands for use in the calculating the masking curve. @@ -131,7 +131,7 @@ void ff_ac3_bit_alloc_calc_psd(int8_t *e int16_t *band_psd); /** - * Calculates the masking curve. + * Calculate the masking curve. * First, the excitation is calculated using parameters in s and the signal * power in each critical band. The excitation is compared with a predefined * hearing threshold table to produce the masking curve. If delta bit @@ -159,7 +159,7 @@ int ff_ac3_bit_alloc_calc_mask(AC3BitAll int16_t *mask); /** - * Calculates bit allocation pointers. + * Calculate bit allocation pointers. * The SNR is the difference between the masking curve and the signal. AC-3 * uses this value for each frequency bin to allocate bits. The snroffset * parameter is a global adjustment to the SNR for all bins. Modified: trunk/libavcodec/ac3_parser.h ============================================================================== --- trunk/libavcodec/ac3_parser.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/ac3_parser.h Wed Jun 30 17:38:06 2010 (r23904) @@ -27,8 +27,8 @@ #include "get_bits.h" /** - * Parses AC-3 frame header. - * Parses the header up to the lfeon element, which is the first 52 or 54 bits + * Parse AC-3 frame header. + * Parse the header up to the lfeon element, which is the first 52 or 54 bits * depending on the audio coding mode. * @param gbc[in] BitContext containing the first 54 bits of the frame. * @param hdr[out] Pointer to struct where header info is written. @@ -39,8 +39,8 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr); /** - * Parses AC-3 frame header and sets channel_map - * Parses the header up to the lfeon (channel_map in E-AC-3) + * Parse AC-3 frame header and sets channel_map + * Parse the header up to the lfeon (channel_map in E-AC-3) * element, which is the first 52, 54 or 104 bits depending * on the audio coding mode. * @param gbc[in] BitContext containing the first 54 bits of the frame. Modified: trunk/libavcodec/ac3tab.c ============================================================================== --- trunk/libavcodec/ac3tab.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/ac3tab.c Wed Jun 30 17:38:06 2010 (r23904) @@ -73,7 +73,7 @@ const uint16_t ff_ac3_frame_size_tab[38] }; /** - * Maps audio coding mode (acmod) to number of full-bandwidth channels. + * Map audio coding mode (acmod) to number of full-bandwidth channels. * from ATSC A/52 Table 5.8 Audio Coding Mode */ const uint8_t ff_ac3_channels_tab[8] = { @@ -81,7 +81,7 @@ const uint8_t ff_ac3_channels_tab[8] = { }; /** - * Maps audio coding mode (acmod) to channel layout mask. + * Map audio coding mode (acmod) to channel layout mask. */ const uint16_t ff_ac3_channel_layout_tab[8] = { CH_LAYOUT_STEREO, Modified: trunk/libavcodec/allcodecs.c ============================================================================== --- trunk/libavcodec/allcodecs.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/allcodecs.c Wed Jun 30 17:38:06 2010 (r23904) @@ -1,5 +1,5 @@ /* - * Provides registration of all codecs, parsers and bitstream filters for libavcodec. + * Provide registration of all codecs, parsers and bitstream filters for libavcodec. * Copyright (c) 2002 Fabrice Bellard * * This file is part of FFmpeg. @@ -21,7 +21,7 @@ /** * @file - * Provides registration of all codecs, parsers and bitstream filters for libavcodec. + * Provide registration of all codecs, parsers and bitstream filters for libavcodec. */ #include "avcodec.h" Modified: trunk/libavcodec/alsdec.c ============================================================================== --- trunk/libavcodec/alsdec.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/alsdec.c Wed Jun 30 17:38:06 2010 (r23904) @@ -271,7 +271,7 @@ static av_cold void dprint_specific_conf } -/** Reads an ALSSpecificConfig from a buffer into the output struct. +/** Read an ALSSpecificConfig from a buffer into the output struct. */ static av_cold int read_specific_config(ALSDecContext *ctx) { @@ -406,7 +406,7 @@ static av_cold int read_specific_config( } -/** Checks the ALSSpecificConfig for unsupported features. +/** Check the ALSSpecificConfig for unsupported features. */ static int check_specific_config(ALSDecContext *ctx) { @@ -430,7 +430,7 @@ static int check_specific_config(ALSDecC } -/** Parses the bs_info field to extract the block partitioning used in +/** Parse the bs_info field to extract the block partitioning used in * block switching mode, refer to ISO/IEC 14496-3, section 11.6.2. */ static void parse_bs_info(const uint32_t bs_info, unsigned int n, @@ -454,7 +454,7 @@ static void parse_bs_info(const uint32_t } -/** Reads and decodes a Rice codeword. +/** Read and decodes a Rice codeword. */ static int32_t decode_rice(GetBitContext *gb, unsigned int k) { @@ -472,7 +472,7 @@ static int32_t decode_rice(GetBitContext } -/** Converts PARCOR coefficient k to direct filter coefficient. +/** Convert PARCOR coefficient k to direct filter coefficient. */ static void parcor_to_lpc(unsigned int k, const int32_t *par, int32_t *cof) { @@ -490,7 +490,7 @@ static void parcor_to_lpc(unsigned int k } -/** Reads block switching field if necessary and sets actual block sizes. +/** Read block switching field if necessary and sets actual block sizes. * Also assures that the block sizes of the last frame correspond to the * actual number of samples. */ @@ -545,7 +545,7 @@ static void get_block_sizes(ALSDecContex } -/** Reads the block data for a constant block +/** Read the block data for a constant block */ static void read_const_block_data(ALSDecContext *ctx, ALSBlockData *bd) { @@ -570,7 +570,7 @@ static void read_const_block_data(ALSDec } -/** Decodes the block data for a constant block +/** Decode the block data for a constant block */ static void decode_const_block_data(ALSDecContext *ctx, ALSBlockData *bd) { @@ -584,7 +584,7 @@ static void decode_const_block_data(ALSD } -/** Reads the block data for a non-constant block +/** Read the block data for a non-constant block */ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) { @@ -831,7 +831,7 @@ static int read_var_block_data(ALSDecCon } -/** Decodes the block data for a non-constant block +/** Decode the block data for a non-constant block */ static int decode_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) { @@ -940,7 +940,7 @@ static int decode_var_block_data(ALSDecC } -/** Reads the block data. +/** Read the block data. */ static int read_block(ALSDecContext *ctx, ALSBlockData *bd) { @@ -958,7 +958,7 @@ static int read_block(ALSDecContext *ctx } -/** Decodes the block data. +/** Decode the block data. */ static int decode_block(ALSDecContext *ctx, ALSBlockData *bd) { @@ -980,7 +980,7 @@ static int decode_block(ALSDecContext *c } -/** Reads and decodes block data successively. +/** Read and decodes block data successively. */ static int read_decode_block(ALSDecContext *ctx, ALSBlockData *bd) { @@ -997,7 +997,7 @@ static int read_decode_block(ALSDecConte } -/** Computes the number of samples left to decode for the current frame and +/** Compute the number of samples left to decode for the current frame and * sets these samples to zero. */ static void zero_remaining(unsigned int b, unsigned int b_max, @@ -1013,7 +1013,7 @@ static void zero_remaining(unsigned int } -/** Decodes blocks independently. +/** Decode blocks independently. */ static int decode_blocks_ind(ALSDecContext *ctx, unsigned int ra_frame, unsigned int c, const unsigned int *div_blocks, @@ -1051,7 +1051,7 @@ static int decode_blocks_ind(ALSDecConte } -/** Decodes blocks dependently. +/** Decode blocks dependently. */ static int decode_blocks(ALSDecContext *ctx, unsigned int ra_frame, unsigned int c, const unsigned int *div_blocks, @@ -1132,7 +1132,7 @@ static int decode_blocks(ALSDecContext * } -/** Reads the channel data. +/** Read the channel data. */ static int read_channel_data(ALSDecContext *ctx, ALSChannelData *cd, int c) { @@ -1260,7 +1260,7 @@ static int revert_channel_correlation(AL } -/** Reads the frame data. +/** Read the frame data. */ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame) { @@ -1389,7 +1389,7 @@ static int read_frame_data(ALSDecContext } -/** Decodes an ALS frame. +/** Decode an ALS frame. */ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, @@ -1511,7 +1511,7 @@ static int decode_frame(AVCodecContext * } -/** Uninitializes the ALS decoder. +/** Uninitialize the ALS decoder. */ static av_cold int decode_end(AVCodecContext *avctx) { @@ -1541,7 +1541,7 @@ static av_cold int decode_end(AVCodecCon } -/** Initializes the ALS decoder. +/** Initialize the ALS decoder. */ static av_cold int decode_init(AVCodecContext *avctx) { @@ -1693,7 +1693,7 @@ static av_cold int decode_init(AVCodecCo } -/** Flushes (resets) the frame ID after seeking. +/** Flush (reset) the frame ID after seeking. */ static av_cold void flush(AVCodecContext *avctx) { Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/avcodec.h Wed Jun 30 17:38:06 2010 (r23904) @@ -48,7 +48,7 @@ #define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE} /** - * Identifies the syntax and semantics of the bitstream. + * Identifie the syntax and semantics of the bitstream. * The principle is roughly: * Two decoders with the same ID can decode the same streams. * Two encoders with the same ID can encode compatible streams. @@ -2951,7 +2951,7 @@ attribute_deprecated ReSampleContext *au int output_rate, int input_rate); #endif /** - * Initializes audio resampling context + * Initialize audio resampling context * * @param output_channels number of output channels * @param input_channels number of input channels @@ -2978,7 +2978,7 @@ void audio_resample_close(ReSampleContex /** - * Initializes an audio resampler. + * Initialize an audio resampler. * Note, if either rate is not an integer then simply scale both rates up so they are. * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq * @param log2_phase_count log2 of the number of entries in the polyphase filterbank @@ -3001,7 +3001,7 @@ int av_resample(struct AVResampleContext /** - * Compensates samplerate/timestamp drift. The compensation is done by changing + * Compensate samplerate/timestamp drift. The compensation is done by changing * the resampler parameters, so no audible clicks or similar distortions occur * @param compensation_distance distance in output samples over which the compensation should be performed * @param sample_delta number of output samples which should be output less @@ -3074,15 +3074,15 @@ void avcodec_set_dimensions(AVCodecConte #if LIBAVCODEC_VERSION_MAJOR < 53 /** - * Returns the pixel format corresponding to the name name. + * Return the pixel format corresponding to the name name. * - * If there is no pixel format with name name, then looks for a + * If there is no pixel format with name name, then look for a * pixel format with the name corresponding to the native endian * format of name. - * For example in a little-endian system, first looks for "gray16", + * For example in a little-endian system, first look for "gray16", * then for "gray16le". * - * Finally if no pixel format has been found, returns PIX_FMT_NONE. + * Finally if no pixel format has been found, return PIX_FMT_NONE. * * @deprecated Deprecated in favor of av_get_pix_fmt(). */ @@ -3090,14 +3090,14 @@ attribute_deprecated enum PixelFormat av #endif /** - * Returns a value representing the fourCC code associated to the + * Return a value representing the fourCC code associated to the * pixel format pix_fmt, or 0 if no associated fourCC code can be * found. */ unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat pix_fmt); /** - * Puts a string representing the codec tag codec_tag in buf. + * Put a string representing the codec tag codec_tag in buf. * * @param buf_size size in bytes of buf * @return the length of the string that would have been generated if @@ -3113,7 +3113,7 @@ size_t av_get_codec_tag_string(char *buf #define FF_LOSS_CHROMA 0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */ /** - * Computes what kind of losses will occur when converting from one specific + * Compute what kind of losses will occur when converting from one specific * pixel format to another. * When converting from one pixel format to another, information loss may occur. * For example, when converting from RGB24 to GRAY, the color information will @@ -3133,7 +3133,7 @@ int avcodec_get_pix_fmt_loss(enum PixelF int has_alpha); /** - * Finds the best pixel format to convert to given a certain source pixel + * Find the best pixel format to convert to given a certain source pixel * format. When converting from one pixel format to another, information loss * may occur. For example, when converting from RGB24 to GRAY, the color * information will be lost. Similarly, other losses occur when converting from @@ -3195,22 +3195,22 @@ int avpicture_deinterlace(AVPicture *dst AVCodec *av_codec_next(AVCodec *c); /** - * Returns the LIBAVCODEC_VERSION_INT constant. + * Return the LIBAVCODEC_VERSION_INT constant. */ unsigned avcodec_version(void); /** - * Returns the libavcodec build-time configuration. + * Return the libavcodec build-time configuration. */ const char *avcodec_configuration(void); /** - * Returns the libavcodec license. + * Return the libavcodec license. */ const char *avcodec_license(void); /** - * Initializes libavcodec. + * Initialize libavcodec. * * @warning This function must be called before any other libavcodec * function. @@ -3232,7 +3232,7 @@ attribute_deprecated void register_avcod void avcodec_register(AVCodec *codec); /** - * Finds a registered encoder with a matching codec ID. + * Find a registered encoder with a matching codec ID. * * @param id CodecID of the requested encoder * @return An encoder if one was found, NULL otherwise. @@ -3240,7 +3240,7 @@ void avcodec_register(AVCodec *codec); AVCodec *avcodec_find_encoder(enum CodecID id); /** - * Finds a registered encoder with the specified name. + * Find a registered encoder with the specified name. * * @param name name of the requested encoder * @return An encoder if one was found, NULL otherwise. @@ -3248,7 +3248,7 @@ AVCodec *avcodec_find_encoder(enum Codec AVCodec *avcodec_find_encoder_by_name(const char *name); /** - * Finds a registered decoder with a matching codec ID. + * Find a registered decoder with a matching codec ID. * * @param id CodecID of the requested decoder * @return A decoder if one was found, NULL otherwise. @@ -3256,7 +3256,7 @@ AVCodec *avcodec_find_encoder_by_name(co AVCodec *avcodec_find_decoder(enum CodecID id); /** - * Finds a registered decoder with the specified name. + * Find a registered decoder with the specified name. * * @param name name of the requested decoder * @return A decoder if one was found, NULL otherwise. @@ -3265,7 +3265,7 @@ AVCodec *avcodec_find_decoder_by_name(co void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode); /** - * Sets the fields of the given AVCodecContext to default values. + * Set the fields of the given AVCodecContext to default values. * * @param s The AVCodecContext of which the fields should be set to default values. */ @@ -3276,7 +3276,7 @@ void avcodec_get_context_defaults(AVCode void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType); /** - * Allocates an AVCodecContext and sets its fields to default values. The + * Allocate an AVCodecContext and set its fields to default values. The * resulting struct can be deallocated by simply calling av_free(). * * @return An AVCodecContext filled with default values or NULL on failure. @@ -3302,14 +3302,14 @@ AVCodecContext *avcodec_alloc_context2(e int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src); /** - * Sets the fields of the given AVFrame to default values. + * Set the fields of the given AVFrame to default values. * * @param pic The AVFrame of which the fields should be set to default values. */ void avcodec_get_frame_defaults(AVFrame *pic); /** - * Allocates an AVFrame and sets its fields to default values. The resulting + * Allocate an AVFrame and set its fields to default values. The resulting * struct can be deallocated by simply calling av_free(). * * @return An AVFrame filled with default values or NULL on failure. @@ -3322,7 +3322,7 @@ void avcodec_default_release_buffer(AVCo int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic); /** - * Returns the amount of padding in pixels which the get_buffer callback must + * Return the amount of padding in pixels which the get_buffer callback must * provide around the edge of the image for codecs which do not have the * CODEC_FLAG_EMU_EDGE flag. * @@ -3330,7 +3330,7 @@ int avcodec_default_reget_buffer(AVCodec */ unsigned avcodec_get_edge_width(void); /** - * Modifies width and height values so that they will result in a memory + * Modify width and height values so that they will result in a memory * buffer that is acceptable for the codec if you do not use any horizontal * padding. * @@ -3340,7 +3340,7 @@ unsigned avcodec_get_edge_width(void); */ void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height); /** - * Modifies width and height values so that they will result in a memory + * Modify width and height values so that they will result in a memory * buffer that is acceptable for the codec if you also ensure that all * line sizes are a multiple of the respective linesize_align[i]. * @@ -3352,7 +3352,7 @@ void avcodec_align_dimensions2(AVCodecCo int linesize_align[4]); /** - * Checks if the given dimension of a picture is valid, meaning that all + * Check if the given dimension of a picture is valid, meaning that all * bytes of the picture can be addressed with a signed int. * * @param[in] w Width of the picture. @@ -3369,7 +3369,7 @@ int avcodec_default_execute2(AVCodecCont //FIXME func typedef /** - * Initializes the AVCodecContext to use the given AVCodec. Prior to using this + * Initialize the AVCodecContext to use the given AVCodec. Prior to using this * function the context has to be allocated. * * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(), @@ -3399,7 +3399,7 @@ int avcodec_open(AVCodecContext *avctx, #if LIBAVCODEC_VERSION_MAJOR < 53 /** - * Decodes an audio frame from buf into samples. + * Decode an audio frame from buf into samples. * Wrapper function which calls avcodec_decode_audio3. * * @deprecated Use avcodec_decode_audio3 instead. @@ -3417,7 +3417,7 @@ attribute_deprecated int avcodec_decode_ #endif /** - * Decodes the audio frame of size avpkt->size from avpkt->data into samples. + * Decode the audio frame of size avpkt->size from avpkt->data into samples. * Some decoders may support multiple frames in a single AVPacket, such * decoders would then just decode the first frame. In this case, * avcodec_decode_audio3 has to be called again with an AVPacket that contains @@ -3461,7 +3461,7 @@ int avcodec_decode_audio3(AVCodecContext #if LIBAVCODEC_VERSION_MAJOR < 53 /** - * Decodes a video frame from buf into picture. + * Decode a video frame from buf into picture. * Wrapper function which calls avcodec_decode_video2. * * @deprecated Use avcodec_decode_video2 instead. @@ -3479,7 +3479,7 @@ attribute_deprecated int avcodec_decode_ #endif /** - * Decodes the video frame of size avpkt->size from avpkt->data into picture. + * Decode the video frame of size avpkt->size from avpkt->data into picture. * Some decoders may support multiple frames in a single AVPacket, such * decoders would then just decode the first frame. * @@ -3532,8 +3532,8 @@ attribute_deprecated int avcodec_decode_ #endif /** - * Decodes a subtitle message. - * Returns a negative value on error, otherwise returns the number of bytes used. + * Decode a subtitle message. + * Return a negative value on error, otherwise returns the number of bytes used. * If no subtitle could be decompressed, got_sub_ptr is zero. * Otherwise, the subtitle is stored in *sub. * @@ -3550,7 +3550,7 @@ int avcodec_parse_frame(AVCodecContext * uint8_t *buf, int buf_size); /** - * Encodes an audio frame from samples into buf. + * Encode an audio frame from samples into buf. * * @note The output buffer should be at least FF_MIN_BUFFER_SIZE bytes large. * However, for PCM audio the user will know how much space is needed @@ -3572,7 +3572,7 @@ int avcodec_encode_audio(AVCodecContext const short *samples); /** - * Encodes a video frame from pict into buf. + * Encode a video frame from pict into buf. * The input picture should be * stored using a specific format, namely avctx.pix_fmt. * @@ -3612,7 +3612,7 @@ void avcodec_default_free_buffers(AVCode /* misc useful functions */ /** - * Returns a single letter to describe the given picture type pict_type. + * Return a single letter to describe the given picture type pict_type. * * @param[in] pict_type the picture type * @return A single character representing the picture type. @@ -3620,7 +3620,7 @@ void avcodec_default_free_buffers(AVCode char av_get_pict_type_char(int pict_type); /** - * Returns codec bits per sample. + * Return codec bits per sample. * * @param[in] codec_id the codec * @return Number of bits per sample or zero if unknown for the given codec. @@ -3628,7 +3628,7 @@ char av_get_pict_type_char(int pict_type int av_get_bits_per_sample(enum CodecID codec_id); /** - * Returns sample format bits per sample. + * Return sample format bits per sample. * * @param[in] sample_fmt the sample format * @return Number of bits per sample or zero if unknown for the given sample format. @@ -3861,15 +3861,14 @@ AVBitStreamFilter *av_bitstream_filter_n /* memory */ /** - * Reallocates the given block if it is not large enough, otherwise it - * does nothing. + * Reallocate the given block if it is not large enough, otherwise do nothing. * * @see av_realloc */ void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size); /** - * Allocates a buffer, reusing the given one if large enough. + * Allocate a buffer, reusing the given one if large enough. * * Contrary to av_fast_realloc the current buffer contents might not be * preserved and on error the old buffer is freed, thus no special @@ -3901,7 +3900,7 @@ int av_picture_pad(AVPicture *dst, const int padtop, int padbottom, int padleft, int padright, int *color); /** - * Encodes extradata length to a buffer. Used by xiph codecs. + * Encode extradata length to a buffer. Used by xiph codecs. * * @param s buffer to write to; must be at least (v/255+1) bytes long * @param v size of extradata in bytes @@ -3910,7 +3909,7 @@ int av_picture_pad(AVPicture *dst, const unsigned int av_xiphlacing(unsigned char *s, unsigned int v); /** - * Parses str and put in width_ptr and height_ptr the detected values. + * Parse str and put in width_ptr and height_ptr the detected values. * * @return 0 in case of a successful parsing, a negative value otherwise * @param[in] str the string to parse: it has to be a string in the format @@ -3923,7 +3922,7 @@ unsigned int av_xiphlacing(unsigned char int av_parse_video_frame_size(int *width_ptr, int *height_ptr, const char *str); /** - * Parses str and put in frame_rate the detected values. + * Parse str and store the detected values in *frame_rate. * * @return 0 in case of a successful parsing, a negative value otherwise * @param[in] str the string to parse: it has to be a string in the format @@ -3948,7 +3947,7 @@ int av_parse_video_frame_rate(AVRational void av_log_missing_feature(void *avc, const char *feature, int want_sample); /** - * Logs a generic warning message asking for a sample. This function is + * Log a generic warning message asking for a sample. This function is * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.) * only, and would normally not be used by applications. * @param[in] avc a pointer to an arbitrary struct of which the first field is @@ -3958,7 +3957,7 @@ void av_log_missing_feature(void *avc, c void av_log_ask_for_sample(void *avc, const char *msg); /** - * Registers the hardware accelerator hwaccel. + * Register the hardware accelerator hwaccel. */ void av_register_hwaccel(AVHWAccel *hwaccel); Modified: trunk/libavcodec/avfft.h ============================================================================== --- trunk/libavcodec/avfft.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/avfft.h Wed Jun 30 17:38:06 2010 (r23904) @@ -85,7 +85,7 @@ enum DCTTransformType { }; /** - * Sets up DCT. + * Set up DCT. * @param nbits size of the input array: * (1 << nbits) for DCT-II, DCT-III and DST-I * (1 << nbits) + 1 for DCT-I Modified: trunk/libavcodec/bgmc.c ============================================================================== --- trunk/libavcodec/bgmc.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/bgmc.c Wed Jun 30 17:38:06 2010 (r23904) @@ -424,7 +424,7 @@ static const uint16_t * const cf_table[1 }; -/** Initializes a given lookup table using a given delta +/** Initialize a given lookup table using a given delta */ static void bgmc_lut_fillp(uint8_t *lut, unsigned int *lut_status, unsigned int delta) @@ -446,7 +446,7 @@ static void bgmc_lut_fillp(uint8_t *lut, } -/** Retunes the index of a suitable lookup table for a given delta +/** Retune the index of a suitable lookup table for a given delta */ static uint8_t* bgmc_lut_getp(uint8_t *lut, unsigned int *lut_status, unsigned int delta) @@ -462,7 +462,7 @@ static uint8_t* bgmc_lut_getp(uint8_t *l } -/** Initializes the lookup table arrays +/** Initialize the lookup table arrays */ int ff_bgmc_init(AVCodecContext *avctx, uint8_t **cf_lut, unsigned int **cf_lut_status) { @@ -479,7 +479,7 @@ int ff_bgmc_init(AVCodecContext *avctx, } -/** Releases the lookup table arrays +/** Release the lookup table arrays */ void ff_bgmc_end(uint8_t **cf_lut, unsigned int **cf_lut_status) { @@ -488,7 +488,7 @@ void ff_bgmc_end(uint8_t **cf_lut, unsig } -/** Initializes decoding and reads the first value +/** Initialize decoding and reads the first value */ void ff_bgmc_decode_init(GetBitContext *gb, unsigned int *h, unsigned int *l, unsigned int *v) @@ -507,7 +507,7 @@ void ff_bgmc_decode_end(GetBitContext *g } -/** Reads and decodes a block Gilbert-Moore coded symbol +/** Read and decode a block Gilbert-Moore coded symbol */ void ff_bgmc_decode(GetBitContext *gb, unsigned int num, int32_t *dst, unsigned int delta, unsigned int sx, Modified: trunk/libavcodec/bink.c ============================================================================== --- trunk/libavcodec/bink.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/bink.c Wed Jun 30 17:38:06 2010 (r23904) @@ -106,7 +106,7 @@ enum BlockTypes { }; /** - * Initializes length length in all bundles. + * Initialize length length in all bundles. * * @param c decoder context * @param width plane width @@ -131,7 +131,7 @@ static void init_lengths(BinkContext *c, } /** - * Allocates memory for bundles. + * Allocate memory for bundles. * * @param c decoder context */ @@ -151,7 +151,7 @@ static av_cold void init_bundles(BinkCon } /** - * Frees memory used by bundles. + * Free memory used by bundles. * * @param c decoder context */ @@ -163,7 +163,7 @@ static av_cold void free_bundles(BinkCon } /** - * Merges two consequent lists of equal size depending on bits read. + * Merge two consequent lists of equal size depending on bits read. * * @param gb context for reading bits * @param dst buffer where merged list will be written to @@ -192,7 +192,7 @@ static void merge(GetBitContext *gb, uin } /** - * Reads information about Huffman tree used to decode data. + * Read information about Huffman tree used to decode data. * * @param gb context for reading bits * @param tree pointer for storing tree data @@ -233,7 +233,7 @@ static void read_tree(GetBitContext *gb, } /** - * Prepares bundle for decoding data. + * Prepare bundle for decoding data. * * @param gb context for reading bits * @param c decoder context @@ -462,7 +462,7 @@ static int read_dcs(AVCodecContext *avct } /** - * Retrieves next value from bundle. + * Retrieve next value from bundle. * * @param c decoder context * @param bundle bundle number @@ -481,7 +481,7 @@ static inline int get_value(BinkContext } /** - * Reads 8x8 block of DCT coefficients. + * Read 8x8 block of DCT coefficients. * * @param gb context for reading bits * @param block place for storing coefficients @@ -583,7 +583,7 @@ static int read_dct_coeffs(GetBitContext } /** - * Reads 8x8 block with residue after motion compensation. + * Read 8x8 block with residue after motion compensation. * * @param gb context for reading bits * @param block place to store read data Modified: trunk/libavcodec/cavsdata.h ============================================================================== --- trunk/libavcodec/cavsdata.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/cavsdata.h Wed Jun 30 17:38:06 2010 (r23904) @@ -88,15 +88,15 @@ const uint16_t ff_cavs_dequant_mul[64] = 32771,35734,38965,42497,46341,50535,55109,60099 }; -/** marks block as unavailable, i.e. out of picture +/** mark block as unavailable, i.e. out of picture or not yet decoded */ const cavs_vector ff_cavs_un_mv = {0,0,1,NOT_AVAIL}; -/** marks block as "no prediction from this direction" +/** mark block as "no prediction from this direction" e.g. forward motion vector in BWD partition */ const cavs_vector ff_cavs_dir_mv = {0,0,1,REF_DIR}; -/** marks block as using intra prediction */ +/** mark block as using intra prediction */ const cavs_vector ff_cavs_intra_mv = {0,0,1,REF_INTRA}; #define EOB 0,0,0 Modified: trunk/libavcodec/celp_math.h ============================================================================== --- trunk/libavcodec/celp_math.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/celp_math.h Wed Jun 30 17:38:06 2010 (r23904) @@ -43,7 +43,7 @@ int16_t ff_cos(uint16_t arg); int ff_exp2(uint16_t power); /** - * Calculates log2(x). + * Calculate log2(x). * @param value function argument, 0 < value <= 7fff ffff * * @return value of (1<<15) * log2(value) Modified: trunk/libavcodec/dirac.h ============================================================================== --- trunk/libavcodec/dirac.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/dirac.h Wed Jun 30 17:38:06 2010 (r23904) @@ -24,7 +24,7 @@ /** * @file - * Interfaces to Dirac Decoder/Encoder + * Interface to Dirac Decoder/Encoder * @author Marco Gerards <marco at gnu.org> */ Modified: trunk/libavcodec/dirac_parser.c ============================================================================== --- trunk/libavcodec/dirac_parser.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/dirac_parser.c Wed Jun 30 17:38:06 2010 (r23904) @@ -33,7 +33,7 @@ #define DIRAC_PARSE_INFO_PREFIX 0x42424344 /** - * Finds the end of the current frame in the bitstream. + * Find the end of the current frame in the bitstream. * @return the position of the first byte of the next frame or -1 */ typedef struct DiracParseContext { Modified: trunk/libavcodec/dsputil.c ============================================================================== --- trunk/libavcodec/dsputil.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/dsputil.c Wed Jun 30 17:38:06 2010 (r23904) @@ -359,7 +359,7 @@ static void draw_edges_c(uint8_t *buf, i } /** - * Copies a rectangular area of samples to a temporary buffer and replicates the boarder samples. + * Copy a rectangular area of samples to a temporary buffer and replicate the border samples. * @param buf destination buffer * @param src source buffer * @param linesize number of bytes between 2 vertically adjacent samples in both the source and destination buffers Modified: trunk/libavcodec/fft.h ============================================================================== --- trunk/libavcodec/fft.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/fft.h Wed Jun 30 17:38:06 2010 (r23904) @@ -84,7 +84,7 @@ extern COSTABLE(65536); extern COSTABLE_CONST FFTSample* const ff_cos_tabs[17]; /** - * Initializes the cosine table in ff_cos_tabs[index] + * Initialize the cosine table in ff_cos_tabs[index] * \param index index in ff_cos_tabs array of the table to initialize */ void ff_init_ff_cos_tabs(int index); @@ -104,7 +104,7 @@ extern SINTABLE(32768); extern SINTABLE(65536); /** - * Sets up a complex FFT. + * Set up a complex FFT. * @param nbits log2 of the length of the input array * @param inverse if 0 perform the forward transform, if 1 perform the inverse */ @@ -205,7 +205,7 @@ struct RDFTContext { }; /** - * Sets up a real FFT. + * Set up a real FFT. * @param nbits log2 of the length of the input array * @param trans the type of transform */ @@ -231,7 +231,7 @@ struct DCTContext { }; /** - * Sets up DCT. + * Set up DCT. * @param nbits size of the input array: * (1 << nbits) for DCT-II, DCT-III and DST-I * (1 << nbits) + 1 for DCT-I Modified: trunk/libavcodec/flacenc.c ============================================================================== --- trunk/libavcodec/flacenc.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/flacenc.c Wed Jun 30 17:38:06 2010 (r23904) @@ -98,7 +98,7 @@ typedef struct FlacEncodeContext { } FlacEncodeContext; /** - * Writes streaminfo metadata block to byte array + * Write streaminfo metadata block to byte array */ static void write_streaminfo(FlacEncodeContext *s, uint8_t *header) { @@ -123,8 +123,8 @@ static void write_streaminfo(FlacEncodeC } /** - * Sets blocksize based on samplerate - * Chooses the closest predefined blocksize >= BLOCK_TIME_MS milliseconds + * Set blocksize based on samplerate + * Choose the closest predefined blocksize >= BLOCK_TIME_MS milliseconds */ static int select_blocksize(int samplerate, int block_time_ms) { Modified: trunk/libavcodec/h261enc.c ============================================================================== --- trunk/libavcodec/h261enc.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/h261enc.c Wed Jun 30 17:38:06 2010 (r23904) @@ -84,7 +84,7 @@ void ff_h261_encode_picture_header(MpegE } /** - * Encodes a group of blocks header. + * Encode a group of blocks header. */ static void h261_encode_gob_header(MpegEncContext * s, int mb_line){ H261Context * h = (H261Context *)s; Modified: trunk/libavcodec/h263.h ============================================================================== --- trunk/libavcodec/h263.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/h263.h Wed Jun 30 17:38:06 2010 (r23904) @@ -93,7 +93,7 @@ void h263_pred_acdc(MpegEncContext * s, /** - * Prints picture info if FF_DEBUG_PICT_INFO is set. + * Print picture info if FF_DEBUG_PICT_INFO is set. */ void ff_h263_show_pict_info(MpegEncContext *s); @@ -102,8 +102,8 @@ int ff_h263_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); /** - * Returns the value of the 3bit "source format" syntax element. - * that represents some standard picture dimensions or indicates that + * Return the value of the 3bit "source format" syntax element. + * This represents some standard picture dimensions or indicates that * width&height are explicitly stored later. */ int av_const h263_get_picture_format(int width, int height); Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/h264.c Wed Jun 30 17:38:06 2010 (r23904) @@ -1690,7 +1690,7 @@ static void field_end(H264Context *h){ } /** - * Replicates H264 "master" context to thread contexts. + * Replicate H264 "master" context to thread contexts. */ static void clone_slice(H264Context *dst, H264Context *src) { Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/h264.h Wed Jun 30 17:38:06 2010 (r23904) @@ -620,7 +620,7 @@ int ff_h264_decode_seq_parameter_set(H26 int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length); /** - * Decodes a network abstraction layer unit. + * Decode a network abstraction layer unit. * @param consumed is the number of bytes used as input * @param length is the length of the array * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp tailing? @@ -629,29 +629,29 @@ int ff_h264_decode_picture_parameter_set const uint8_t *ff_h264_decode_nal(H264Context *h, const uint8_t *src, int *dst_length, int *consumed, int length); /** - * identifies the exact end of the bitstream + * Identify the exact end of the bitstream * @return the length of the trailing, or 0 if damaged */ int ff_h264_decode_rbsp_trailing(H264Context *h, const uint8_t *src); /** - * frees any data that may have been allocated in the H264 context like SPS, PPS etc. + * Free any data that may have been allocated in the H264 context like SPS, PPS etc. */ av_cold void ff_h264_free_context(H264Context *h); /** - * reconstructs bitstream slice_type. + * Reconstruct bitstream slice_type. */ int ff_h264_get_slice_type(const H264Context *h); /** - * allocates tables. + * Allocate tables. * needs width/height */ int ff_h264_alloc_tables(H264Context *h); /** - * fills the default_ref_list. + * Fill the default_ref_list. */ int ff_h264_fill_default_ref_list(H264Context *h); @@ -660,7 +660,7 @@ void ff_h264_fill_mbaff_ref_list(H264Con void ff_h264_remove_all_refs(H264Context *h); /** - * Executes the reference picture marking (memory management control operations). + * Execute the reference picture marking (memory management control operations). */ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count); @@ -668,12 +668,12 @@ int ff_h264_decode_ref_pic_marking(H264C /** - * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. + * Check if the top & left blocks are available if needed & change the dc mode so it only uses the available blocks. */ int ff_h264_check_intra4x4_pred_mode(H264Context *h); /** - * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. + * Check if the top & left blocks are available if needed & change the dc mode so it only uses the available blocks. */ int ff_h264_check_intra_pred_mode(H264Context *h, int mode); @@ -686,13 +686,13 @@ av_cold int ff_h264_decode_end(AVCodecCo av_cold void ff_h264_decode_init_vlc(void); /** - * decodes a macroblock + * Decode a macroblock * @return 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed */ int ff_h264_decode_mb_cavlc(H264Context *h); /** - * decodes a CABAC coded macroblock + * Decode a CABAC coded macroblock * @return 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed */ int ff_h264_decode_mb_cabac(H264Context *h); Modified: trunk/libavcodec/h264pred.c ============================================================================== --- trunk/libavcodec/h264pred.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/h264pred.c Wed Jun 30 17:38:06 2010 (r23904) @@ -1184,7 +1184,7 @@ static void pred8x8_horizontal_add_c(uin /** - * Sets the intra prediction function pointers. + * Set the intra prediction function pointers. */ void ff_h264_pred_init(H264PredContext *h, int codec_id){ // MpegEncContext * const s = &h->s; Modified: trunk/libavcodec/idcinvideo.c ============================================================================== --- trunk/libavcodec/idcinvideo.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/idcinvideo.c Wed Jun 30 17:38:06 2010 (r23904) @@ -77,7 +77,7 @@ typedef struct IdcinContext { /* * Find the lowest probability node in a Huffman table, and mark it as * being assigned to a higher probability. - * Returns the node index of the lowest unused node, or -1 if all nodes + * @return the node index of the lowest unused node, or -1 if all nodes * are used. */ static int huff_smallest_node(hnode *hnodes, int num_hnodes) { Modified: trunk/libavcodec/iff.c ============================================================================== --- trunk/libavcodec/iff.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/iff.c Wed Jun 30 17:38:06 2010 (r23904) @@ -215,7 +215,7 @@ static void decodeplane32(uint32_t *dst, } /** - * Decodes one complete byterun1 encoded line. + * Decode one complete byterun1 encoded line. * * @param dst the destination buffer where to store decompressed bitstream * @param dst_size the destination plane size in bytes Modified: trunk/libavcodec/indeo5.c ============================================================================== --- trunk/libavcodec/indeo5.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/indeo5.c Wed Jun 30 17:38:06 2010 (r23904) @@ -80,7 +80,7 @@ typedef struct { /** - * Decodes Indeo5 GOP (Group of pictures) header. + * Decode Indeo5 GOP (Group of pictures) header. * This header is present in key frames only. * It defines parameters for all frames in a GOP. * @@ -296,7 +296,7 @@ static int decode_gop_header(IVI5DecCont /** - * Skips a header extension. + * Skip a header extension. * * @param gb [in,out] the GetBit context */ @@ -312,7 +312,7 @@ static inline void skip_hdr_extension(Ge /** - * Decodes Indeo5 picture header. + * Decode Indeo5 picture header. * * @param ctx [in,out] ptr to the decoder context * @param avctx [in] ptr to the AVCodecContext @@ -364,7 +364,7 @@ static int decode_pic_hdr(IVI5DecContext /** - * Decodes Indeo5 band header. + * Decode Indeo5 band header. * * @param ctx [in,out] ptr to the decoder context * @param band [in,out] ptr to the band descriptor @@ -432,7 +432,7 @@ static int decode_band_hdr(IVI5DecContex /** - * Decodes info (block type, cbp, quant delta, motion vector) + * Decode info (block type, cbp, quant delta, motion vector) * for all macroblocks in the current tile. * * @param ctx [in,out] ptr to the decoder context @@ -557,7 +557,7 @@ static int decode_mb_info(IVI5DecContext /** - * Decodes an Indeo5 band. + * Decode an Indeo5 band. * * @param ctx [in,out] ptr to the decoder context * @param band [in,out] ptr to the band descriptor @@ -647,7 +647,7 @@ static int decode_band(IVI5DecContext *c /** - * Switches buffers. + * Switch buffers. * * @param ctx [in,out] ptr to the decoder context */ @@ -690,7 +690,7 @@ static void switch_buffers(IVI5DecContex /** - * Initializes Indeo5 decoder. + * Initialize Indeo5 decoder. */ static av_cold int decode_init(AVCodecContext *avctx) { @@ -800,7 +800,7 @@ static int decode_frame(AVCodecContext * /** - * Closes Indeo5 decoder and cleans up its context. + * Close Indeo5 decoder and clean up its context. */ static av_cold int decode_close(AVCodecContext *avctx) { Modified: trunk/libavcodec/internal.h ============================================================================== --- trunk/libavcodec/internal.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/internal.h Wed Jun 30 17:38:06 2010 (r23904) @@ -28,12 +28,12 @@ #include "avcodec.h" /** - * Determines whether pix_fmt is a hardware accelerated format. + * Determine whether pix_fmt is a hardware accelerated format. */ int ff_is_hwaccel_pix_fmt(enum PixelFormat pix_fmt); /** - * Returns the hardware accelerated codec for codec codec_id and + * Return the hardware accelerated codec for codec codec_id and * pixel format pix_fmt. * * @param codec_id the codec to match Modified: trunk/libavcodec/ituh263enc.c ============================================================================== --- trunk/libavcodec/ituh263enc.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/ituh263enc.c Wed Jun 30 17:38:06 2010 (r23904) @@ -84,7 +84,7 @@ static const uint8_t wrong_run[102] = { }; /** - * Returns the 4 bit value that specifies the given aspect ratio. + * Return the 4 bit value that specifies the given aspect ratio. * This may be one of the standard aspect ratios or it specifies * that the aspect will be stored explicitly later. */ @@ -245,7 +245,7 @@ void h263_encode_picture_header(MpegEncC } /** - * Encodes a group of blocks header. + * Encode a group of blocks header. */ void h263_encode_gob_header(MpegEncContext * s, int mb_line) { Modified: trunk/libavcodec/ivi_common.c ============================================================================== --- trunk/libavcodec/ivi_common.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/ivi_common.c Wed Jun 30 17:38:06 2010 (r23904) @@ -40,7 +40,7 @@ VLC ff_ivi_mb_vlc_tabs [8]; VLC ff_ivi_blk_vlc_tabs[8]; /** - * Reverses "nbits" bits of the value "val" and returns the result + * Reverse "nbits" bits of the value "val" and return the result * in the least significant bits. */ static uint16_t inv_bits(uint16_t val, int nbits) Modified: trunk/libavcodec/ivi_common.h ============================================================================== --- trunk/libavcodec/ivi_common.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/ivi_common.h Wed Jun 30 17:38:06 2010 (r23904) @@ -194,7 +194,7 @@ typedef struct { uint8_t chroma_bands; } IVIPicConfig; -/** compares some properties of two pictures */ +/** compare some properties of two pictures */ static inline int ivi_pic_config_cmp(IVIPicConfig *str1, IVIPicConfig *str2) { return (str1->pic_width != str2->pic_width || str1->pic_height != str2->pic_height || @@ -213,15 +213,15 @@ static inline int ivi_pic_config_cmp(IVI /** convert unsigned values into signed ones (the sign is in the LSB) */ #define IVI_TOSIGNED(val) (-(((val) >> 1) ^ -((val) & 1))) -/** scales motion vector */ +/** scale motion vector */ static inline int ivi_scale_mv(int mv, int mv_scale) { return (mv + (mv > 0) + (mv_scale - 1)) >> mv_scale; } /** - * Generates a huffman codebook from the given descriptor - * and converts it into the FFmpeg VLC table. + * Generate a huffman codebook from the given descriptor + * and convert it into the FFmpeg VLC table. * * @param cb [in] pointer to codebook descriptor * @param vlc [out] where to place the generated VLC table @@ -231,13 +231,13 @@ static inline int ivi_scale_mv(int mv, i int ff_ivi_create_huff_from_desc(const IVIHuffDesc *cb, VLC *vlc, int flag); /** - * Initializes static codes used for macroblock and block decoding. + * Initialize static codes used for macroblock and block decoding. */ void ff_ivi_init_static_vlc(void); /** - * Decodes a huffman codebook descriptor from the bitstream - * and selects specified huffman table. + * Decode a huffman codebook descriptor from the bitstream + * and select specified huffman table. * * @param gb [in,out] the GetBit context * @param desc_coded [in] flag signalling if table descriptor was coded @@ -250,7 +250,7 @@ int ff_ivi_dec_huff_desc(GetBitContext IVIHuffTab *huff_tab, AVCodecContext *avctx); /** - * Compares two huffman codebook descriptors. + * Compare two huffman codebook descriptors. * * @param desc1 [in] ptr to the 1st descriptor to compare * @param desc2 [in] ptr to the 2nd descriptor to compare @@ -259,7 +259,7 @@ int ff_ivi_dec_huff_desc(GetBitContext int ff_ivi_huff_desc_cmp(const IVIHuffDesc *desc1, const IVIHuffDesc *desc2); /** - * Copies huffman codebook descriptors. + * Copy huffman codebook descriptors. * * @param dst [out] ptr to the destination descriptor * @param src [in] ptr to the source descriptor @@ -267,7 +267,7 @@ int ff_ivi_huff_desc_cmp(const IVIHuffD void ff_ivi_huff_desc_copy(IVIHuffDesc *dst, const IVIHuffDesc *src); /** - * Initializes planes (prepares descriptors, allocates buffers etc). + * Initialize planes (prepares descriptors, allocates buffers etc). * * @param planes [in,out] pointer to the array of the plane descriptors * @param cfg [in] pointer to the ivi_pic_config structure describing picture layout @@ -276,14 +276,14 @@ void ff_ivi_huff_desc_copy(IVIHuffDesc * int ff_ivi_init_planes(IVIPlaneDesc *planes, const IVIPicConfig *cfg); /** - * Frees planes, bands and macroblocks buffers. + * Free planes, bands and macroblocks buffers. * * @param planes [in] pointer to the array of the plane descriptors */ void ff_ivi_free_buffers(IVIPlaneDesc *planes); /** - * Initializes tile and macroblock descriptors. + * Initialize tile and macroblock descriptors. * * @param planes [in,out] pointer to the array of the plane descriptors * @param tile_width [in] tile width @@ -293,7 +293,7 @@ void ff_ivi_free_buffers(IVIPlaneDesc *p int ff_ivi_init_tiles(IVIPlaneDesc *planes, int tile_width, int tile_height); /** - * Decodes size of the tile data. + * Decode size of the tile data. * The size is stored as a variable-length field having the following format: * if (tile_data_size < 255) than this field is only one byte long * if (tile_data_size >= 255) than this field four is byte long: 0xFF X1 X2 X3 @@ -305,9 +305,9 @@ int ff_ivi_init_tiles(IVIPlaneDesc *pla int ff_ivi_dec_tile_data_size(GetBitContext *gb); /** - * Decodes block data: - * extracts huffman-coded transform coefficients from the bitstream, - * dequantizes them, applies inverse transform and motion compensation + * Decode block data: + * extract huffman-coded transform coefficients from the bitstream, + * dequantize them, apply inverse transform and motion compensation * in order to reconstruct the picture. * * @param gb [in,out] the GetBit context @@ -318,7 +318,7 @@ int ff_ivi_dec_tile_data_size(GetBitCon int ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile); /** - * Handles empty tiles by performing data copying and motion + * Handle empty tiles by performing data copying and motion * compensation respectively. * * @param avctx [in] ptr to the AVCodecContext @@ -330,7 +330,7 @@ void ff_ivi_process_empty_tile(AVCodecCo IVITile *tile, int32_t mv_scale); /** - * Converts and outputs the current plane. + * Convert and output the current plane. * This conversion is done by adding back the bias value of 128 * (subtracted in the encoder) and clipping the result. * @@ -342,12 +342,12 @@ void ff_ivi_output_plane(IVIPlaneDesc *p #if IVI_DEBUG /** - * Calculates band checksum from band data. + * Calculate band checksum from band data. */ uint16_t ivi_calc_band_checksum (IVIBandDesc *band); /** - * Verifies that band data lies in range. + * Verify that band data lies in range. */ int ivi_check_band (IVIBandDesc *band, const uint8_t *ref, int pitch); #endif Modified: trunk/libavcodec/ivi_dsp.h ============================================================================== --- trunk/libavcodec/ivi_dsp.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/ivi_dsp.h Wed Jun 30 17:38:06 2010 (r23904) @@ -117,13 +117,13 @@ void ff_ivi_dc_row_slant(const int32_t * void ff_ivi_dc_col_slant(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size); /** - * Copies the pixels into the frame buffer. + * Copy the pixels into the frame buffer. */ void ff_ivi_put_pixels_8x8(const int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags); /** - * Copies the DC coefficient into the first pixel of the block and - * zeroes all others. + * Copy the DC coefficient into the first pixel of the block and + * zero all others. */ void ff_ivi_put_dc_pixel_8x8(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size); Modified: trunk/libavcodec/libtheoraenc.c ============================================================================== --- trunk/libavcodec/libtheoraenc.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/libtheoraenc.c Wed Jun 30 17:38:06 2010 (r23904) @@ -49,7 +49,7 @@ typedef struct TheoraContext { int keyframe_mask; } TheoraContext; -/** Concatenates an ogg_packet into the extradata. */ +/** Concatenate an ogg_packet into the extradata. */ static int concatenate_packet(unsigned int* offset, AVCodecContext* avc_context, const ogg_packet* packet) Modified: trunk/libavcodec/libxvidff.c ============================================================================== --- trunk/libavcodec/libxvidff.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/libxvidff.c Wed Jun 30 17:38:06 2010 (r23904) @@ -75,7 +75,7 @@ int xvid_ff_2pass(void *ref, int opt, vo void xvid_correct_framerate(AVCodecContext *avctx); /** - * Creates the private context for the encoder. + * Create the private context for the encoder. * All buffers are allocated, settings are loaded from the user, * and the encoder context created. * @@ -359,7 +359,7 @@ static av_cold int xvid_encode_init(AVCo } /** - * Encodes a single frame. + * Encode a single frame. * * @param avctx AVCodecContext pointer to context * @param frame Pointer to encoded frame buffer @@ -469,7 +469,7 @@ static int xvid_encode_frame(AVCodecCont } /** - * Destroys the private context for the encoder. + * Destroy the private context for the encoder. * All buffers are freed, and the Xvid encoder context is destroyed. * * @param avctx AVCodecContext pointer to context @@ -609,7 +609,7 @@ void xvid_correct_framerate(AVCodecConte */ /** - * Initializes the two-pass plugin and context. + * Initialize the two-pass plugin and context. * * @param param Input construction parameter structure * @param handle Private context handle @@ -640,7 +640,7 @@ static int xvid_ff_2pass_create(xvid_plg } /** - * Destroys the two-pass plugin context. + * Destroy the two-pass plugin context. * * @param ref Context pointer for the plugin * @param param Destrooy context @@ -656,7 +656,7 @@ static int xvid_ff_2pass_destroy(struct } /** - * Enables fast encode mode during the first pass. + * Enable fast encode mode during the first pass. * * @param ref Context pointer for the plugin * @param param Frame data @@ -699,7 +699,7 @@ static int xvid_ff_2pass_before(struct x } /** - * Captures statistic data and writes it during first pass. + * Capture statistic data and write it during first pass. * * @param ref Context pointer for the plugin * @param param Statistic data Modified: trunk/libavcodec/lpc.c ============================================================================== --- trunk/libavcodec/lpc.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/lpc.c Wed Jun 30 17:38:06 2010 (r23904) @@ -52,7 +52,7 @@ static void apply_welch_window(const int } /** - * Calculates autocorrelation data from audio samples + * Calculate autocorrelation data from audio samples * A Welch window function is applied before calculation. */ void ff_lpc_compute_autocorr(const int32_t *data, int len, int lag, Modified: trunk/libavcodec/lpc.h ============================================================================== --- trunk/libavcodec/lpc.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/lpc.h Wed Jun 30 17:38:06 2010 (r23904) @@ -56,7 +56,7 @@ void ff_lpc_compute_autocorr(const int32 /** * Levinson-Durbin recursion. - * Produces LPC coefficients from autocorrelation data. + * Produce LPC coefficients from autocorrelation data. */ static inline int compute_lpc_coefs(const LPC_TYPE *autoc, int max_order, LPC_TYPE *lpc, int lpc_stride, int fail, Modified: trunk/libavcodec/lsp.h ============================================================================== --- trunk/libavcodec/lsp.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/lsp.h Wed Jun 30 17:38:06 2010 (r23904) @@ -85,7 +85,7 @@ void ff_acelp_lp_decode(int16_t* lp_1st, #define MAX_LP_ORDER (2*MAX_LP_HALF_ORDER) /** - * Reconstructs LPC coefficients from the line spectral pair frequencies. + * Reconstruct LPC coefficients from the line spectral pair frequencies. * * @param lsp line spectral pairs in cosine domain * @param lpc linear predictive coding coefficients @@ -106,7 +106,7 @@ void ff_acelp_lspd2lpc(const double *lsp void ff_sort_nearly_sorted_floats(float *vals, int len); /** - * Computes the Pa / (1 + z(-1)) or Qa / (1 - z(-1)) coefficients + * Compute the Pa / (1 + z(-1)) or Qa / (1 - z(-1)) coefficients * needed for LSP to LPC conversion. * We only need to calculate the 6 first elements of the polynomial. * Modified: trunk/libavcodec/mlpdec.c ============================================================================== --- trunk/libavcodec/mlpdec.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/mlpdec.c Wed Jun 30 17:38:06 2010 (r23904) @@ -939,8 +939,8 @@ static int output_data(MLPDecodeContext /** Read an access unit from the stream. - * Returns < 0 on error, 0 if not enough data is present in the input stream - * otherwise returns the number of bytes consumed. */ + * @return negative on error, 0 if not enough data is present in the input stream, + * otherwise the number of bytes consumed. */ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size, AVPacket *avpkt) Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/mpeg12.c Wed Jun 30 17:38:06 2010 (r23904) @@ -1920,7 +1920,7 @@ static int slice_decode_thread(AVCodecCo } /** - * Handles slice ends. + * Handle slice ends. * @return 1 if it seems to be the last slice */ static int slice_end(AVCodecContext *avctx, AVFrame *pict) @@ -2155,7 +2155,7 @@ static void mpeg_decode_gop(AVCodecConte time_code_pictures, s->closed_gop, broken_link); } /** - * Finds the end of the current frame in the bitstream. + * Find the end of the current frame in the bitstream. * @return the position of the first byte of the next frame, or -1 */ int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s) Modified: trunk/libavcodec/mpeg4videoenc.c ============================================================================== --- trunk/libavcodec/mpeg4videoenc.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/mpeg4videoenc.c Wed Jun 30 17:38:06 2010 (r23904) @@ -54,7 +54,7 @@ max run: 29/41 /** - * Returns the number of bits that encoding the 8x8 block in block would need. + * Return the number of bits that encoding the 8x8 block in block would need. * @param[in] block_last_index last index in scantable order that refers to a non zero element in block. */ static inline int get_block_rate(MpegEncContext * s, DCTELEM block[64], int block_last_index, uint8_t scantable[64]){ @@ -82,7 +82,7 @@ static inline int get_block_rate(MpegEnc /** - * Restores the ac coefficients in block that have been changed by decide_ac_pred(). + * Restore the ac coefficients in block that have been changed by decide_ac_pred(). * This function also restores s->block_last_index. * @param[in,out] block MB coefficients, these will be restored * @param[in] dir ac prediction direction for each 8x8 block @@ -113,7 +113,7 @@ static inline void restore_ac_coeffs(Mpe } /** - * Returns the optimal value (0 or 1) for the ac_pred element for the given MB in mpeg4. + * Return the optimal value (0 or 1) for the ac_pred element for the given MB in mpeg4. * This function will also update s->block_last_index and s->ac_val. * @param[in,out] block MB coefficients, these will be updated if 1 is returned * @param[in] dir ac prediction direction for each 8x8 block Modified: trunk/libavcodec/mpegvideo.c ============================================================================== --- trunk/libavcodec/mpegvideo.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/mpegvideo.c Wed Jun 30 17:38:06 2010 (r23904) @@ -200,7 +200,7 @@ void ff_copy_picture(Picture *dst, Pictu } /** - * Releases a frame buffer + * Release a frame buffer */ static void free_frame_buffer(MpegEncContext *s, Picture *pic) { @@ -209,7 +209,7 @@ static void free_frame_buffer(MpegEncCon } /** - * Allocates a frame buffer + * Allocate a frame buffer */ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic) { Modified: trunk/libavcodec/mpegvideo_xvmc.c ============================================================================== --- trunk/libavcodec/mpegvideo_xvmc.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/mpegvideo_xvmc.c Wed Jun 30 17:38:06 2010 (r23904) @@ -33,7 +33,7 @@ #include "xvmc_internal.h" /** - * Initializes the block field of the MpegEncContext pointer passed as + * Initialize the block field of the MpegEncContext pointer passed as * parameter after making sure that the data is not corrupted. * In order to implement something like direct rendering instead of decoding * coefficients in s->blocks and then copying them, copy them directly @@ -48,7 +48,7 @@ void ff_xvmc_init_block(MpegEncContext * } /** - * Fills individual block pointers, so there are no gaps in the data_block array + * Fill individual block pointers, so there are no gaps in the data_block array * in case not all blocks in the macroblock are coded. */ void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp) @@ -67,7 +67,7 @@ void ff_xvmc_pack_pblocks(MpegEncContext } /** - * Finds and stores the surfaces that are used as reference frames. + * Find and store the surfaces that are used as reference frames. * This function should be called for every new field and/or frame. * It should be safe to call the function a few times for the same field. */ @@ -134,7 +134,7 @@ return -1; } /** - * Completes frame/field rendering by passing any remaining blocks. + * Complete frame/field rendering by passing any remaining blocks. * Normally ff_draw_horiz_band() is called for each slice, however, * some leftover blocks, for example from error_resilience(), may remain. * It should be safe to call the function a few times for the same field. @@ -149,8 +149,8 @@ void ff_xvmc_field_end(MpegEncContext *s } /** - * Synthesizes the data needed by XvMC to render one macroblock of data. - * Fills all relevant fields, if necessary do IDCT. + * Synthesize the data needed by XvMC to render one macroblock of data. + * Fill all relevant fields, if necessary do IDCT. */ void ff_xvmc_decode_mb(MpegEncContext *s) { Modified: trunk/libavcodec/msrledec.h ============================================================================== --- trunk/libavcodec/msrledec.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/msrledec.h Wed Jun 30 17:38:06 2010 (r23904) @@ -25,7 +25,7 @@ #include "avcodec.h" /** - * Decodes stream in MS RLE format into frame. + * Decode stream in MS RLE format into frame. * * @param avctx codec context * @param pic destination frame Modified: trunk/libavcodec/nellymoserenc.c ============================================================================== --- trunk/libavcodec/nellymoserenc.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/nellymoserenc.c Wed Jun 30 17:38:06 2010 (r23904) @@ -270,7 +270,7 @@ static void get_exponent_dynamic(NellyMo } /** - * Encodes NELLY_SAMPLES samples. It assumes, that samples contains 3 * NELLY_BUF_LEN values + * Encode NELLY_SAMPLES samples. It assumes, that samples contains 3 * NELLY_BUF_LEN values * @param s encoder context * @param output output buffer * @param output_size size of output buffer Modified: trunk/libavcodec/opt.h ============================================================================== --- trunk/libavcodec/opt.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/opt.h Wed Jun 30 17:38:06 2010 (r23904) @@ -139,7 +139,7 @@ typedef struct AVOption2 { /** - * Looks for an option in obj. Looks only for the options which + * Look for an option in obj. Look only for the options which * have the flags set as specified in mask and flags (that is, * for which it is the case that opt->flags & mask == flags). * @@ -168,7 +168,7 @@ attribute_deprecated const AVOption *av_ #endif /** - * Sets the field of obj with the given name to value. + * Set the field of obj with the given name to value. * * @param[in] obj A struct whose first element is a pointer to an * AVClass. Modified: trunk/libavcodec/parser.h ============================================================================== --- trunk/libavcodec/parser.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/parser.h Wed Jun 30 17:38:06 2010 (r23904) @@ -61,7 +61,7 @@ void ff_parse_close(AVCodecParserContext void ff_parse1_close(AVCodecParserContext *s); /** - * Fetches timestamps for a specific byte within the current access unit. + * Fetch timestamps for a specific byte within the current access unit. * @param off byte position within the access unit * @param remove Found timestamps will be removed if set to 1, kept if set to 0. */ Modified: trunk/libavcodec/pgssubdec.c ============================================================================== --- trunk/libavcodec/pgssubdec.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/pgssubdec.c Wed Jun 30 17:38:06 2010 (r23904) @@ -80,7 +80,7 @@ static av_cold int close_decoder(AVCodec } /** - * Decodes the RLE data. + * Decode the RLE data. * * The subtitle is stored as an Run Length Encoded image. * @@ -141,7 +141,7 @@ static int decode_rle(AVCodecContext *av } /** - * Parses the picture segment packet. + * Parse the picture segment packet. * * The picture segment contains details on the sequence id, * width, height and Run Length Encoded (RLE) bitmap data. @@ -205,7 +205,7 @@ static int parse_picture_segment(AVCodec } /** - * Parses the palette segment packet. + * Parse the palette segment packet. * * The palette segment contains details of the palette, * a maximum of 256 colors can be defined. @@ -246,7 +246,7 @@ static void parse_palette_segment(AVCode } /** - * Parses the presentation segment packet. + * Parse the presentation segment packet. * * The presentation segment contains details on the video * width, video height, x & y subtitle position. @@ -317,7 +317,7 @@ static void parse_presentation_segment(A } /** - * Parses the display segment packet. + * Parse the display segment packet. * * The display segment controls the updating of the display. * Modified: trunk/libavcodec/ppc/check_altivec.c ============================================================================== --- trunk/libavcodec/ppc/check_altivec.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/ppc/check_altivec.c Wed Jun 30 17:38:06 2010 (r23904) @@ -19,7 +19,7 @@ /** * @file - * Checks for AltiVec presence. + * Check for AltiVec presence. */ #ifdef __APPLE__ Modified: trunk/libavcodec/put_bits.h ============================================================================== --- trunk/libavcodec/put_bits.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/put_bits.h Wed Jun 30 17:38:06 2010 (r23904) @@ -52,7 +52,7 @@ typedef struct PutBitContext { } PutBitContext; /** - * Initializes the PutBitContext s. + * Initialize the PutBitContext s. * * @param buffer the buffer where to put bits * @param buffer_size the size in bytes of buffer @@ -79,7 +79,7 @@ static inline void init_put_bits(PutBitC } /** - * Returns the total number of bits written to the bitstream. + * @return the total number of bits written to the bitstream. */ static inline int put_bits_count(PutBitContext *s) { @@ -91,7 +91,7 @@ static inline int put_bits_count(PutBitC } /** - * Pads the end of the output stream with zeros. + * Pad the end of the output stream with zeros. */ static inline void flush_put_bits(PutBitContext *s) { @@ -123,19 +123,19 @@ static inline void flush_put_bits(PutBit #define ff_copy_bits ff_copy_bits_unsupported_here #else /** - * Pads the bitstream with zeros up to the next byte boundary. + * Pad the bitstream with zeros up to the next byte boundary. */ void align_put_bits(PutBitContext *s); /** - * Puts the string string in the bitstream. + * Put the string string in the bitstream. * * @param terminate_string 0-terminates the written string if value is 1 */ void ff_put_string(PutBitContext *pb, const char *string, int terminate_string); /** - * Copies the content of src to the bitstream. + * Copy the content of src to the bitstream. * * @param length the number of bits of src to copy */ @@ -143,7 +143,7 @@ void ff_copy_bits(PutBitContext *pb, con #endif /** - * Writes up to 31 bits into a bitstream. + * Write up to 31 bits into a bitstream. * Use put_bits32 to write 32 bits. */ static inline void put_bits(PutBitContext *s, int n, unsigned int value) @@ -270,7 +270,7 @@ static inline void put_sbits(PutBitConte } /** - * Writes exactly 32 bits into a bitstream. + * Write exactly 32 bits into a bitstream. */ static void av_unused put_bits32(PutBitContext *s, uint32_t value) { @@ -286,7 +286,7 @@ static void av_unused put_bits32(PutBitC } /** - * Returns the pointer to the byte where the bitstream writer will put + * Return the pointer to the byte where the bitstream writer will put * the next bit. */ static inline uint8_t* put_bits_ptr(PutBitContext *s) @@ -299,7 +299,7 @@ static inline uint8_t* put_bits_ptr(PutB } /** - * Skips the given number of bytes. + * Skip the given number of bytes. * PutBitContext must be flushed & aligned to a byte boundary before calling this. */ static inline void skip_put_bytes(PutBitContext *s, int n) @@ -315,7 +315,7 @@ static inline void skip_put_bytes(PutBit } /** - * Skips the given number of bits. + * Skip the given number of bits. * Must only be used if the actual values in the bitstream do not matter. * If n is 0 the behavior is undefined. */ @@ -331,7 +331,7 @@ static inline void skip_put_bits(PutBitC } /** - * Changes the end of the buffer. + * Change the end of the buffer. * * @param size the new size in bytes of the buffer where to put bits */ Modified: trunk/libavcodec/qcelpdec.c ============================================================================== --- trunk/libavcodec/qcelpdec.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/qcelpdec.c Wed Jun 30 17:38:06 2010 (r23904) @@ -101,8 +101,8 @@ static av_cold int qcelp_decode_init(AVC } /** - * Decodes the 10 quantized LSP frequencies from the LSPV/LSP - * transmission codes of any bitrate and checks for badly received packets. + * Decode the 10 quantized LSP frequencies from the LSPV/LSP + * transmission codes of any bitrate and check for badly received packets. * * @param q the context * @param lspf line spectral pair frequencies @@ -197,7 +197,7 @@ static int decode_lspf(QCELPContext *q, } /** - * Converts codebook transmission codes to GAIN and INDEX. + * Convert codebook transmission codes to GAIN and INDEX. * * @param q the context * @param gain array holding the decoded gain @@ -309,7 +309,7 @@ static int codebook_sanity_check_for_rat } /** - * Computes the scaled codebook vector Cdn From INDEX and GAIN + * Compute the scaled codebook vector Cdn From INDEX and GAIN * for all rates. * * The specification lacks some information here. @@ -564,8 +564,8 @@ static void apply_pitch_filters(QCELPCon } /** - * Reconstructs LPC coefficients from the line spectral pair frequencies - * and performs bandwidth expansion. + * Reconstruct LPC coefficients from the line spectral pair frequencies + * and perform bandwidth expansion. * * @param lspf line spectral pair frequencies * @param lpc linear predictive coding coefficients @@ -594,7 +594,7 @@ static void lspf2lpc(const float *lspf, } /** - * Interpolates LSP frequencies and computes LPC coefficients + * Interpolate LSP frequencies and computes LPC coefficients * for a given bitrate & pitch subframe. * * TIA/EIA/IS-733 2.4.3.3.4, 2.4.8.7.2 Modified: trunk/libavcodec/qdm2.c ============================================================================== --- trunk/libavcodec/qdm2.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/qdm2.c Wed Jun 30 17:38:06 2010 (r23904) @@ -385,7 +385,7 @@ static uint16_t qdm2_packet_checksum (co /** - * Fills a QDM2SubPacket structure with packet type, size, and data pointer. + * Fill a QDM2SubPacket structure with packet type, size, and data pointer. * * @param gb bitreader context * @param sub_packet packet under analysis @@ -436,7 +436,7 @@ static QDM2SubPNode* qdm2_search_subpack /** - * Replaces 8 elements with their average value. + * Replace 8 elements with their average value. * Called by qdm2_decode_superblock before starting subblock decoding. * * @param q context Modified: trunk/libavcodec/qtrleenc.c ============================================================================== --- trunk/libavcodec/qtrleenc.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/qtrleenc.c Wed Jun 30 17:38:06 2010 (r23904) @@ -104,7 +104,7 @@ static av_cold int qtrle_encode_init(AVC } /** - * Computes the best RLE sequence for a line + * Compute the best RLE sequence for a line */ static void qtrle_encode_line(QtrleEncContext *s, AVFrame *p, int line, uint8_t **buf) { @@ -235,7 +235,7 @@ static void qtrle_encode_line(QtrleEncCo bytestream_put_byte(buf, -1); // end RLE line } -/** Encodes frame including header */ +/** Encode frame including header */ static int encode_frame(QtrleEncContext *s, AVFrame *p, uint8_t *buf) { int i; Modified: trunk/libavcodec/ra144enc.c ============================================================================== --- trunk/libavcodec/ra144enc.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/ra144enc.c Wed Jun 30 17:38:06 2010 (r23904) @@ -59,7 +59,7 @@ static av_cold int ra144_encode_init(AVC /** - * Quantizes a value by searching a sorted table for the element with the + * Quantize a value by searching a sorted table for the element with the * nearest value * * @param value value to quantize @@ -88,7 +88,7 @@ static int quantize(int value, const int /** - * Orthogonalizes a vector to another vector + * Orthogonalize a vector to another vector * * @param v vector to orthogonalize * @param u vector against which orthogonalization is performed @@ -109,7 +109,7 @@ static void orthogonalize(float *v, cons /** - * Calculates match score and gain of an LPC-filtered vector with respect to + * Calculate match score and gain of an LPC-filtered vector with respect to * input data, possibly othogonalizing it to up to 2 other vectors * * @param work array used to calculate the filtered vector @@ -148,7 +148,7 @@ static void get_match_score(float *work, /** - * Creates a vector from the adaptive codebook at a given lag value + * Create a vector from the adaptive codebook at a given lag value * * @param vect array where vector is stored * @param cb adaptive codebook @@ -168,7 +168,7 @@ static void create_adapt_vect(float *vec /** - * Searches the adaptive codebook for the best entry and gain and removes its + * Search the adaptive codebook for the best entry and gain and remove its * contribution from input data * * @param adapt_cb array from which the adaptive codebook is extracted @@ -210,7 +210,7 @@ static int adaptive_cb_search(const int1 /** - * Finds the best vector of a fixed codebook by applying an LPC filter to + * Find the best vector of a fixed codebook by applying an LPC filter to * codebook entries, possibly othogonalizing them to up to 2 other vectors and * matching the results with input data * @@ -249,7 +249,7 @@ static void find_best_vect(float *work, /** - * Searches the two fixed codebooks for the best entry and gain + * Search the two fixed codebooks for the best entry and gain * * @param work array used to calculate LPC-filtered vectors * @param coefs coefficients of the LPC filter @@ -301,7 +301,7 @@ static void fixed_cb_search(float *work, /** - * Encodes a subblock of the current frame + * Encode a subblock of the current frame * * @param ractx encoder context * @param sblock_data input data of the subblock Modified: trunk/libavcodec/roqvideoenc.c ============================================================================== --- trunk/libavcodec/roqvideoenc.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/roqvideoenc.c Wed Jun 30 17:38:06 2010 (r23904) @@ -165,7 +165,7 @@ static int eval_motion_dist(RoqContext * } /** - * Returns distortion between two macroblocks + * @return distortion between two macroblocks */ static inline int squared_diff_macroblock(uint8_t a[], uint8_t b[], int size) { @@ -240,7 +240,7 @@ typedef struct RoqTempData } RoqTempdata; /** - * Initializes cel evaluators and sets their source coordinates + * Initialize cel evaluators and set their source coordinates */ static void create_cel_evals(RoqContext *enc, RoqTempdata *tempData) { @@ -393,7 +393,7 @@ static void motion_search(RoqContext *en } /** - * Gets distortion for all options available to a subcel + * Get distortion for all options available to a subcel */ static void gather_data_for_subcel(SubcelEvaluation *subcel, int x, int y, RoqContext *enc, RoqTempdata *tempData) @@ -457,7 +457,7 @@ static void gather_data_for_subcel(Subce } /** - * Gets distortion for all options available to a cel + * Get distortion for all options available to a cel */ static void gather_data_for_cel(CelEvaluation *cel, RoqContext *enc, RoqTempdata *tempData) @@ -773,7 +773,7 @@ static inline void frame_block_to_cell(u } /** - * Creates YUV clusters for the entire image + * Create YUV clusters for the entire image */ static void create_clusters(AVFrame *frame, int w, int h, uint8_t *yuvClusters) { Modified: trunk/libavcodec/sipr.c ============================================================================== --- trunk/libavcodec/sipr.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/sipr.c Wed Jun 30 17:38:06 2010 (r23904) @@ -184,7 +184,7 @@ static void pitch_sharpening(int pitch_l } /** - * Extracts decoding parameters from the input bitstream. + * Extract decoding parameters from the input bitstream. * @param parms parameters structure * @param pgb pointer to initialized GetBitContext structure */ @@ -254,7 +254,7 @@ static void sipr_decode_lp(float *lsfnew } /** - * Evaluates the adaptive impulse response. + * Evaluate the adaptive impulse response. */ static void eval_ir(const float *Az, int pitch_lag, float *freq, float pitch_sharp_factor) @@ -276,7 +276,7 @@ static void eval_ir(const float *Az, int } /** - * Evaluates the convolution of a vector with a sparse vector. + * Evaluate the convolution of a vector with a sparse vector. */ static void convolute_with_sparse(float *out, const AMRFixed *pulses, const float *shape, int length) Modified: trunk/libavcodec/twinvq.c ============================================================================== --- trunk/libavcodec/twinvq.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/twinvq.c Wed Jun 30 17:38:06 2010 (r23904) @@ -258,7 +258,7 @@ static float eval_lpc_spectrum(const flo } /** - * Evaluates the LPC amplitude spectrum envelope from the line spectrum pairs. + * Evaluate the LPC amplitude spectrum envelope from the line spectrum pairs. */ static void eval_lpcenv(TwinContext *tctx, const float *cos_vals, float *lpc) { @@ -291,7 +291,7 @@ static inline float get_cos(int idx, int } /** - * Evaluates the LPC amplitude spectrum envelope from the line spectrum pairs. + * Evaluate the LPC amplitude spectrum envelope from the line spectrum pairs. * Probably for speed reasons, the coefficients are evaluated as * siiiibiiiisiiiibiiiisiiiibiiiisiiiibiiiis ... * where s is an evaluated value, i is a value interpolated from the others Modified: trunk/libavcodec/utils.c ============================================================================== --- trunk/libavcodec/utils.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/utils.c Wed Jun 30 17:38:06 2010 (r23904) @@ -1075,7 +1075,7 @@ unsigned int av_xiphlacing(unsigned char /* Wrapper to work around the lack of mkstemp() on mingw/cygin. * Also, tries to create file in /tmp first, if possible. * *prefix can be a character constant; *filename will be allocated internally. - * Returns file descriptor of opened file (or -1 on error) + * @return file descriptor of opened file (or -1 on error) * and opened file name in **filename. */ int av_tempfile(char *prefix, char **filename) { int fd=-1; Modified: trunk/libavcodec/vaapi_h264.c ============================================================================== --- trunk/libavcodec/vaapi_h264.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/vaapi_h264.c Wed Jun 30 17:38:06 2010 (r23904) @@ -29,7 +29,7 @@ */ /** - * Initializes an empty VA API picture. + * Initialize an empty VA API picture. * * VA API requires a fixed-size reference picture array. */ @@ -42,7 +42,7 @@ static void init_vaapi_pic(VAPictureH264 } /** - * Translates an FFmpeg Picture into its VA API form. + * Translate an FFmpeg Picture into its VA API form. * * @param[out] va_pic A pointer to VA API's own picture struct * @param[in] pic A pointer to the FFmpeg picture struct to convert @@ -82,7 +82,7 @@ typedef struct DPB { } DPB; /** - * Appends picture to the decoded picture buffer, in a VA API form that + * Append picture to the decoded picture buffer, in a VA API form that * merges the second field picture attributes with the first, if * available. The decoded picture buffer's size must be large enough * to receive the new VA API picture object. @@ -117,7 +117,7 @@ static int dpb_add(DPB *dpb, Picture *pi return 0; } -/** Fills in VA API reference frames array. */ +/** Fill in VA API reference frames array. */ static int fill_vaapi_ReferenceFrames(VAPictureParameterBufferH264 *pic_param, H264Context *h) { @@ -145,7 +145,7 @@ static int fill_vaapi_ReferenceFrames(VA } /** - * Fills in VA API reference picture lists from the FFmpeg reference + * Fill in VA API reference picture lists from the FFmpeg reference * picture list. * * @param[out] RefPicList VA API internal reference picture list @@ -166,7 +166,7 @@ static void fill_vaapi_RefPicList(VAPict } /** - * Fills in prediction weight table. + * Fill in prediction weight table. * * VA API requires a plain prediction weight table as it does not infer * any value. @@ -216,7 +216,7 @@ static void fill_vaapi_plain_pred_weight } } -/** Initializes and starts decoding a frame with VA API. */ +/** Initialize and start decoding a frame with VA API. */ static int start_frame(AVCodecContext *avctx, av_unused const uint8_t *buffer, av_unused uint32_t size) @@ -284,7 +284,7 @@ static int start_frame(AVCodecContext return 0; } -/** Ends a hardware decoding based frame. */ +/** End a hardware decoding based frame. */ static int end_frame(AVCodecContext *avctx) { H264Context * const h = avctx->priv_data; @@ -293,7 +293,7 @@ static int end_frame(AVCodecContext *avc return ff_vaapi_common_end_frame(&h->s); } -/** Decodes the given H.264 slice with VA API. */ +/** Decode the given H.264 slice with VA API. */ static int decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size) Modified: trunk/libavcodec/vaapi_vc1.c ============================================================================== --- trunk/libavcodec/vaapi_vc1.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/vaapi_vc1.c Wed Jun 30 17:38:06 2010 (r23904) @@ -24,7 +24,7 @@ #include "vc1.h" #include "vc1data.h" -/** Translates FFmpeg MV modes to VA API */ +/** Translate FFmpeg MV modes to VA API */ static int get_VAMvModeVC1(enum MVModes mv_mode) { switch (mv_mode) { @@ -37,7 +37,7 @@ static int get_VAMvModeVC1(enum MVModes return 0; } -/** Checks whether the MVTYPEMB bitplane is present */ +/** Check whether the MVTYPEMB bitplane is present */ static inline int vc1_has_MVTYPEMB_bitplane(VC1Context *v) { if (v->mv_type_is_raw) @@ -48,7 +48,7 @@ static inline int vc1_has_MVTYPEMB_bitpl v->mv_mode2 == MV_PMODE_MIXED_MV))); } -/** Checks whether the SKIPMB bitplane is present */ +/** Check whether the SKIPMB bitplane is present */ static inline int vc1_has_SKIPMB_bitplane(VC1Context *v) { if (v->skip_is_raw) @@ -57,7 +57,7 @@ static inline int vc1_has_SKIPMB_bitplan (v->s.pict_type == FF_B_TYPE && !v->bi_type)); } -/** Checks whether the DIRECTMB bitplane is present */ +/** Check whether the DIRECTMB bitplane is present */ static inline int vc1_has_DIRECTMB_bitplane(VC1Context *v) { if (v->dmb_is_raw) @@ -65,7 +65,7 @@ static inline int vc1_has_DIRECTMB_bitpl return v->s.pict_type == FF_B_TYPE && !v->bi_type; } -/** Checks whether the ACPRED bitplane is present */ +/** Check whether the ACPRED bitplane is present */ static inline int vc1_has_ACPRED_bitplane(VC1Context *v) { if (v->acpred_is_raw) Modified: trunk/libavcodec/vp3.c ============================================================================== --- trunk/libavcodec/vp3.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/vp3.c Wed Jun 30 17:38:06 2010 (r23904) @@ -258,7 +258,7 @@ typedef struct Vp3DecodeContext { * superblocks <-> fragments, macroblocks <-> fragments, * superblocks <-> macroblocks * - * Returns 0 is successful; returns 1 if *anything* went wrong. + * @return 0 is successful; returns 1 if *anything* went wrong. */ static int init_block_mapping(Vp3DecodeContext *s) { @@ -1270,7 +1270,7 @@ static void apply_loop_filter(Vp3DecodeC } /** - * Pulls DCT tokens from the 64 levels to decode and dequant the coefficients + * Pull DCT tokens from the 64 levels to decode and dequant the coefficients * for the next block in coding order */ static inline int vp3_dequant(Vp3DecodeContext *s, Vp3Fragment *frag, Modified: trunk/libavcodec/wmavoice.c ============================================================================== --- trunk/libavcodec/wmavoice.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/wmavoice.c Wed Jun 30 17:38:06 2010 (r23904) @@ -287,7 +287,7 @@ typedef struct { } WMAVoiceContext; /** - * Sets up the variable bit mode (VBM) tree from container extradata. + * Set up the variable bit mode (VBM) tree from container extradata. * @param gb bit I/O context. * The bit context (s->gb) should be loaded with byte 23-46 of the * container extradata (i.e. the ones containing the VBM tree). Modified: trunk/libavcodec/x86/vc1dsp_mmx.c ============================================================================== --- trunk/libavcodec/x86/vc1dsp_mmx.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/x86/vc1dsp_mmx.c Wed Jun 30 17:38:06 2010 (r23904) @@ -411,7 +411,7 @@ typedef void (*vc1_mspel_mc_filter_hor_1 typedef void (*vc1_mspel_mc_filter_8bits)(uint8_t *dst, const uint8_t *src, x86_reg stride, int rnd, x86_reg offset); /** - * Interpolates fractional pel values by applying proper vertical then + * Interpolate fractional pel values by applying proper vertical then * horizontal filter. * * @param dst Destination buffer for interpolated pels. Modified: trunk/libavcodec/xiph.h ============================================================================== --- trunk/libavcodec/xiph.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/xiph.h Wed Jun 30 17:38:06 2010 (r23904) @@ -24,7 +24,7 @@ #include "libavutil/common.h" /** - * Splits a single extradata buffer into the three headers that most + * Split a single extradata buffer into the three headers that most * Xiph codecs use. (e.g. Theora and Vorbis) * Works both with Matroska's packing and lavc's packing. * Modified: trunk/libavcodec/xsubenc.c ============================================================================== --- trunk/libavcodec/xsubenc.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/xsubenc.c Wed Jun 30 17:38:06 2010 (r23904) @@ -35,7 +35,7 @@ #define PADDING_COLOR 0 /** - * Encodes a single color run. At most 16 bits will be used. + * Encode a single color run. At most 16 bits will be used. * \param len length of the run, values > 255 mean "until end of line", may not be < 0. * \param color color to encode, only the lowest two bits are used and all others must be 0. */ @@ -49,7 +49,7 @@ static void put_xsub_rle(PutBitContext * } /** - * Encodes a 4-color bitmap with XSUB rle. + * Encode a 4-color bitmap with XSUB rle. * * The encoded bitmap may be wider than the source bitmap due to padding. */ Modified: trunk/libavcodec/xvmc.h ============================================================================== --- trunk/libavcodec/xvmc.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/xvmc.h Wed Jun 30 17:38:06 2010 (r23904) @@ -71,7 +71,7 @@ struct xvmc_pix_fmt { */ int allocated_data_blocks; - /** Indicates that the hardware would interpret data_blocks as IDCT + /** Indicate that the hardware would interpret data_blocks as IDCT coefficients and perform IDCT on them. - application - set during initialization - libavcodec - unchanged Modified: trunk/libavcodec/yop.c ============================================================================== --- trunk/libavcodec/yop.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavcodec/yop.c Wed Jun 30 17:38:06 2010 (r23904) @@ -114,7 +114,7 @@ static av_cold int yop_decode_close(AVCo } /** - * Paints a macroblock using the pattern in paint_lut. + * Paint a macroblock using the pattern in paint_lut. * @param s codec context * @param tag the tag that was in the nibble */ @@ -130,7 +130,7 @@ static void yop_paint_block(YopDecContex } /** - * Copies a previously painted macroblock to the current_block. + * Copy a previously painted macroblock to the current_block. * @param copy_tag the tag that was in the nibble */ static int yop_copy_previous_block(YopDecContext *s, int copy_tag) @@ -155,7 +155,7 @@ static int yop_copy_previous_block(YopDe } /** - * Returns the next nibble in sequence, consuming a new byte on the input + * Return the next nibble in sequence, consuming a new byte on the input * only if necessary. */ static uint8_t yop_get_next_nibble(YopDecContext *s) @@ -173,7 +173,7 @@ static uint8_t yop_get_next_nibble(YopDe } /** - * Takes s->dstptr to the next macroblock in sequence. + * Take s->dstptr to the next macroblock in sequence. */ static void yop_next_macroblock(YopDecContext *s) { Modified: trunk/libavdevice/alsa-audio.h ============================================================================== --- trunk/libavdevice/alsa-audio.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavdevice/alsa-audio.h Wed Jun 30 17:38:06 2010 (r23904) @@ -50,7 +50,7 @@ typedef struct { } AlsaData; /** - * Opens an ALSA PCM. + * Open an ALSA PCM. * * @param s media file handle * @param mode either SND_PCM_STREAM_CAPTURE or SND_PCM_STREAM_PLAYBACK @@ -68,7 +68,7 @@ int ff_alsa_open(AVFormatContext *s, snd int channels, enum CodecID *codec_id); /** - * Closes the ALSA PCM. + * Close the ALSA PCM. * * @param s1 media file handle * @@ -77,7 +77,7 @@ int ff_alsa_open(AVFormatContext *s, snd int ff_alsa_close(AVFormatContext *s1); /** - * Tries to recover from ALSA buffer underrun. + * Try to recover from ALSA buffer underrun. * * @param s1 media file handle * @param err error code reported by the previous ALSA call Modified: trunk/libavdevice/avdevice.h ============================================================================== --- trunk/libavdevice/avdevice.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavdevice/avdevice.h Wed Jun 30 17:38:06 2010 (r23904) @@ -34,17 +34,17 @@ #define LIBAVDEVICE_BUILD LIBAVDEVICE_VERSION_INT /** - * Returns the LIBAVDEVICE_VERSION_INT constant. + * Return the LIBAVDEVICE_VERSION_INT constant. */ unsigned avdevice_version(void); /** - * Returns the libavdevice build-time configuration. + * Return the libavdevice build-time configuration. */ const char *avdevice_configuration(void); /** - * Returns the libavdevice license. + * Return the libavdevice license. */ const char *avdevice_license(void); Modified: trunk/libavdevice/x11grab.c ============================================================================== --- trunk/libavdevice/x11grab.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavdevice/x11grab.c Wed Jun 30 17:38:06 2010 (r23904) @@ -71,7 +71,7 @@ struct x11_grab }; /** - * Initializes the x11 grab device demuxer (public device demuxer API). + * Initialize the x11 grab device demuxer (public device demuxer API). * * @param s1 Context from avformat core * @param ap Parameters from avformat core @@ -238,7 +238,7 @@ x11grab_read_header(AVFormatContext *s1, } /** - * Paints a mouse pointer in an X11 image. + * Paint a mouse pointer in an X11 image. * * @param image image to paint the mouse pointer to * @param s context used to retrieve original grabbing rectangle @@ -288,7 +288,7 @@ paint_mouse_pointer(XImage *image, struc /** - * Reads new data in the image structure. + * Read new data in the image structure. * * @param dpy X11 display to grab from * @param d @@ -335,7 +335,7 @@ xget_zpixmap(Display *dpy, Drawable d, X } /** - * Grabs a frame from x11 (public device demuxer API). + * Grab a frame from x11 (public device demuxer API). * * @param s1 Context from avformat core * @param pkt Packet holding the brabbed frame @@ -398,7 +398,7 @@ x11grab_read_packet(AVFormatContext *s1, } /** - * Closes x11 frame grabber (public device demuxer API). + * Close x11 frame grabber (public device demuxer API). * * @param s1 Context from avformat core * @return 0 success, !0 failure Modified: trunk/libavfilter/avfilter.h ============================================================================== --- trunk/libavfilter/avfilter.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavfilter/avfilter.h Wed Jun 30 17:38:06 2010 (r23904) @@ -40,17 +40,17 @@ #include "libavcodec/avcodec.h" /** - * Returns the LIBAVFILTER_VERSION_INT constant. + * Return the LIBAVFILTER_VERSION_INT constant. */ unsigned avfilter_version(void); /** - * Returns the libavfilter build-time configuration. + * Return the libavfilter build-time configuration. */ const char *avfilter_configuration(void); /** - * Returns the libavfilter license. + * Return the libavfilter license. */ const char *avfilter_license(void); @@ -121,7 +121,7 @@ typedef struct AVFilterPicRef } AVFilterPicRef; /** - * Adds a new reference to a picture. + * Add a new reference to a picture. * @param ref an existing reference to the picture * @param pmask a bitmask containing the allowable permissions in the new * reference @@ -131,7 +131,7 @@ typedef struct AVFilterPicRef AVFilterPicRef *avfilter_ref_pic(AVFilterPicRef *ref, int pmask); /** - * Removes a reference to a picture. If this is the last reference to the + * Remove a reference to a picture. If this is the last reference to the * picture, the picture itself is also automatically freed. * @param ref reference to the picture */ @@ -188,7 +188,7 @@ struct AVFilterFormats }; /** - * Creates a list of supported formats. This is intended for use in + * Create a list of supported formats. This is intended for use in * AVFilter->query_formats(). * @param pix_fmt list of pixel formats, terminated by PIX_FMT_NONE * @return the format list, with no existing references @@ -196,7 +196,7 @@ struct AVFilterFormats AVFilterFormats *avfilter_make_format_list(const enum PixelFormat *pix_fmts); /** - * Adds pix_fmt to the list of pixel formats contained in *avff. + * Add pix_fmt to the list of pixel formats contained in *avff. * If *avff is NULL the function allocates the filter formats struct * and puts its pointer in *avff. * @@ -206,12 +206,12 @@ AVFilterFormats *avfilter_make_format_li int avfilter_add_colorspace(AVFilterFormats **avff, enum PixelFormat pix_fmt); /** - * Returns a list of all colorspaces supported by FFmpeg. + * Return a list of all colorspaces supported by FFmpeg. */ AVFilterFormats *avfilter_all_colorspaces(void); /** - * Returns a format list which contains the intersection of the formats of + * Return a format list which contains the intersection of the formats of * a and b. Also, all the references of a, all the references of b, and * a and b themselves will be deallocated. * @@ -221,7 +221,7 @@ AVFilterFormats *avfilter_all_colorspace AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b); /** - * Adds *ref as a new reference to formats. + * Add *ref as a new reference to formats. * That is the pointers will point like in the ascii art below: * ________ * |formats |<--------. @@ -235,7 +235,7 @@ AVFilterFormats *avfilter_merge_formats( void avfilter_formats_ref(AVFilterFormats *formats, AVFilterFormats **ref); /** - * If *ref is non-NULL, removes *ref as a reference to the format list + * If *ref is non-NULL, remove *ref as a reference to the format list * it currently points to, deallocates that list if this was the last * reference, and sets *ref to NULL. * @@ -524,7 +524,7 @@ struct AVFilterLink }; /** - * Links two filters together. + * Link two filters together. * @param src the source filter * @param srcpad index of the output pad on the source filter * @param dst the destination filter @@ -535,14 +535,14 @@ int avfilter_link(AVFilterContext *src, AVFilterContext *dst, unsigned dstpad); /** - * Negotiates the colorspace, dimensions, etc of all inputs to a filter. + * Negotiate the colorspace, dimensions, etc of all inputs to a filter. * @param filter the filter to negotiate the properties for its inputs * @return zero on successful negotiation */ int avfilter_config_links(AVFilterContext *filter); /** - * Requests a picture buffer with a specific set of permissions. + * Request a picture buffer with a specific set of permissions. * @param link the output link to the filter from which the picture will * be requested * @param perms the required access permissions @@ -555,14 +555,14 @@ AVFilterPicRef *avfilter_get_video_buffe int w, int h); /** - * Requests an input frame from the filter at the other end of the link. + * Request an input frame from the filter at the other end of the link. * @param link the input link * @return zero on success */ int avfilter_request_frame(AVFilterLink *link); /** - * Polls a frame from the filter chain. + * Poll a frame from the filter chain. * @param link the input link * @return the number of immediately available frames, a negative * number in case of error @@ -570,7 +570,7 @@ int avfilter_request_frame(AVFilterLink int avfilter_poll_frame(AVFilterLink *link); /** - * Notifies the next filter of the start of a frame. + * Notifie the next filter of the start of a frame. * @param link the output link the frame will be sent over * @param picref A reference to the frame about to be sent. The data for this * frame need only be valid once draw_slice() is called for that @@ -580,13 +580,13 @@ int avfilter_poll_frame(AVFilterLink *li void avfilter_start_frame(AVFilterLink *link, AVFilterPicRef *picref); /** - * Notifies the next filter that the current frame has finished. + * Notifie the next filter that the current frame has finished. * @param link the output link the frame was sent over */ void avfilter_end_frame(AVFilterLink *link); /** - * Sends a slice to the next filter. + * Send a slice to the next filter. * * Slices have to be provided in sequential order, either in * top-bottom or bottom-top order. If slices are provided in @@ -602,14 +602,14 @@ void avfilter_end_frame(AVFilterLink *li */ void avfilter_draw_slice(AVFilterLink *link, int y, int h, int slice_dir); -/** Initializes the filter system. Registers all builtin filters. */ +/** Initialize the filter system. Register all builtin filters. */ void avfilter_register_all(void); -/** Uninitializes the filter system. Unregisters all filters. */ +/** Uninitialize the filter system. Unregister all filters. */ void avfilter_uninit(void); /** - * Registers a filter. This is only needed if you plan to use + * Register a filter. This is only needed if you plan to use * avfilter_get_by_name later to lookup the AVFilter structure by name. A * filter can still by instantiated with avfilter_open even if it is not * registered. @@ -620,7 +620,7 @@ void avfilter_uninit(void); int avfilter_register(AVFilter *filter); /** - * Gets a filter definition matching the given name. + * Get a filter definition matching the given name. * @param name the filter name to find * @return the filter definition, if any matching one is registered. * NULL if none found. @@ -636,7 +636,7 @@ AVFilter *avfilter_get_by_name(const cha AVFilter **av_filter_next(AVFilter **filter); /** - * Creates a filter instance. + * Create a filter instance. * @param filter the filter to create an instance of * @param inst_name Name to give to the new instance. Can be NULL for none. * @return Pointer to the new instance on success. NULL on failure. @@ -644,7 +644,7 @@ AVFilter **av_filter_next(AVFilter **fil AVFilterContext *avfilter_open(AVFilter *filter, const char *inst_name); /** - * Initializes a filter. + * Initialize a filter. * @param filter the filter to initialize * @param args A string of parameters to use when initializing the filter. * The format and meaning of this string varies by filter. @@ -655,13 +655,13 @@ AVFilterContext *avfilter_open(AVFilter int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque); /** - * Destroys a filter. + * Destroy a filter. * @param filter the filter to destroy */ void avfilter_destroy(AVFilterContext *filter); /** - * Inserts a filter in the middle of an existing link. + * Insert a filter in the middle of an existing link. * @param link the link into which the filter should be inserted * @param filt the filter to be inserted * @param in the input pad on the filter to connect @@ -672,7 +672,7 @@ int avfilter_insert_filter(AVFilterLink unsigned in, unsigned out); /** - * Inserts a new pad. + * Insert a new pad. * @param idx Insertion point. Pad is inserted at the end if this point * is beyond the end of the list of pads. * @param count Pointer to the number of pads in the list @@ -687,7 +687,7 @@ void avfilter_insert_pad(unsigned idx, u AVFilterPad **pads, AVFilterLink ***links, AVFilterPad *newpad); -/** Inserts a new input pad for the filter. */ +/** Insert a new input pad for the filter. */ static inline void avfilter_insert_inpad(AVFilterContext *f, unsigned index, AVFilterPad *p) { @@ -695,7 +695,7 @@ static inline void avfilter_insert_inpad &f->input_pads, &f->inputs, p); } -/** Inserts a new output pad for the filter. */ +/** Insert a new output pad for the filter. */ static inline void avfilter_insert_outpad(AVFilterContext *f, unsigned index, AVFilterPad *p) { Modified: trunk/libavfilter/avfiltergraph.h ============================================================================== --- trunk/libavfilter/avfiltergraph.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavfilter/avfiltergraph.h Wed Jun 30 17:38:06 2010 (r23904) @@ -32,7 +32,7 @@ typedef struct AVFilterGraph { } AVFilterGraph; /** - * Gets a filter instance with name name from graph. + * Get a filter instance with name name from graph. * * @return the pointer to the found filter instance or NULL if it * cannot be found. @@ -40,7 +40,7 @@ typedef struct AVFilterGraph { AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name); /** - * Adds an existing filter instance to a filter graph. + * Add an existing filter instance to a filter graph. * * @param graph the filter graph * @param filter the filter to be added @@ -48,7 +48,7 @@ AVFilterContext *avfilter_graph_get_filt int avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter); /** - * Checks for the validity of graph. + * Check for the validity of graph. * * A graph is considered valid if all its input and output pads are * connected. @@ -58,19 +58,19 @@ int avfilter_graph_add_filter(AVFilterGr int avfilter_graph_check_validity(AVFilterGraph *graphctx, AVClass *log_ctx); /** - * Configures all the links of graphctx. + * Configure all the links of graphctx. * * @return 0 in case of success, a negative value otherwise */ int avfilter_graph_config_links(AVFilterGraph *graphctx, AVClass *log_ctx); /** - * Configures the formats of all the links in the graph. + * Configure the formats of all the links in the graph. */ int avfilter_graph_config_formats(AVFilterGraph *graphctx, AVClass *log_ctx); /** - * Frees a graph and destroys its links. + * Free a graph and destroy its links. */ void avfilter_graph_destroy(AVFilterGraph *graph); Modified: trunk/libavfilter/graphparser.h ============================================================================== --- trunk/libavfilter/graphparser.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavfilter/graphparser.h Wed Jun 30 17:38:06 2010 (r23904) @@ -37,7 +37,7 @@ typedef struct AVFilterInOut { } AVFilterInOut; /** - * Adds a graph described by a string to a graph. + * Add a graph described by a string to a graph. * * @param graph the filter graph where to link the parsed graph context * @param filters string to be parsed Modified: trunk/libavfilter/parseutils.c ============================================================================== --- trunk/libavfilter/parseutils.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavfilter/parseutils.c Wed Jun 30 17:38:06 2010 (r23904) @@ -288,7 +288,7 @@ int av_parse_color(uint8_t *rgba_color, } /** - * Stores the value in the field in ctx that is named like key. + * Store the value in the field in ctx that is named like key. * ctx must be an AVClass context, storing is done using AVOptions. * * @param buf the string to parse, buf will be updated to point at the Modified: trunk/libavfilter/parseutils.h ============================================================================== --- trunk/libavfilter/parseutils.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavfilter/parseutils.h Wed Jun 30 17:38:06 2010 (r23904) @@ -28,8 +28,8 @@ #include "libavcodec/opt.h" /** - * Unescapes the given string until a non escaped terminating char, - * and returns the token corresponding to the unescaped string. + * Unescape the given string until a non escaped terminating char, + * and return the token corresponding to the unescaped string. * * The normal \ and ' escaping is supported. Leading and trailing * whitespaces are removed. @@ -43,7 +43,7 @@ char *av_get_token(const char **buf, const char *term); /** - * Puts the RGBA values that correspond to color_string in rgba_color. + * Put the RGBA values that correspond to color_string in rgba_color. * * @param color_string a string specifying a color. It can be the name of * a color (case insensitive match) or a 0xRRGGBB[AA] sequence, @@ -62,7 +62,7 @@ char *av_get_token(const char **buf, con int av_parse_color(uint8_t *rgba_color, const char *color_string, void *log_ctx); /** - * Parses the key/value pairs list in opts. For each key/value pair + * Parse the key/value pairs list in opts. For each key/value pair * found, stores the value in the field in ctx that is named like the * key. ctx must be an AVClass context, storing is done using * AVOptions. Modified: trunk/libavformat/avformat.h ============================================================================== --- trunk/libavformat/avformat.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavformat/avformat.h Wed Jun 30 17:38:06 2010 (r23904) @@ -42,12 +42,12 @@ unsigned avformat_version(void); /** - * Returns the libavformat build-time configuration. + * Return the libavformat build-time configuration. */ const char *avformat_configuration(void); /** - * Returns the libavformat license. + * Return the libavformat license. */ const char *avformat_license(void); @@ -130,7 +130,7 @@ typedef struct AVMetadata AVMetadata; typedef struct AVMetadataConv AVMetadataConv; /** - * Gets a metadata element with matching key. + * Get a metadata element with matching key. * @param prev Set to the previous matching element to find the next. * If set to NULL the first matching element is returned. * @param flags Allows case as well as suffix-insensitive comparisons. @@ -141,7 +141,7 @@ av_metadata_get(AVMetadata *m, const cha #if LIBAVFORMAT_VERSION_MAJOR == 52 /** - * Sets the given tag in m, overwriting an existing tag. + * Set the given tag in m, overwriting an existing tag. * @param key tag key to add to m (will be av_strduped) * @param value tag value to add to m (will be av_strduped) * @return >= 0 on success otherwise an error code <0 @@ -151,7 +151,7 @@ attribute_deprecated int av_metadata_set #endif /** - * Sets the given tag in m, overwriting an existing tag. + * Set the given tag in m, overwriting an existing tag. * @param key tag key to add to m (will be av_strduped depending on flags) * @param value tag value to add to m (will be av_strduped depending on flags). * Passing a NULL value will cause an existing tag to be deleted. @@ -160,7 +160,7 @@ attribute_deprecated int av_metadata_set int av_metadata_set2(AVMetadata **pm, const char *key, const char *value, int flags); /** - * Converts all the metadata sets from ctx according to the source and + * Convert all the metadata sets from ctx according to the source and * destination conversion tables. If one of the tables is NULL, then * tags are converted to/from ffmpeg generic tag names. * @param d_conv destination tags format conversion table @@ -170,7 +170,7 @@ void av_metadata_conv(struct AVFormatCon const AVMetadataConv *s_conv); /** - * Frees all the memory allocated for an AVMetadata struct. + * Free all the memory allocated for an AVMetadata struct. */ void av_metadata_free(AVMetadata **m); @@ -179,7 +179,7 @@ void av_metadata_free(AVMetadata **m); /** - * Allocates and reads the payload of a packet and initializes its + * Allocate and read the payload of a packet and initialize its * fields with default values. * * @param pkt packet @@ -349,18 +349,18 @@ typedef struct AVInputFormat { /** General purpose read-only value that the format can use. */ int value; - /** Starts/resumes playing - only meaningful if using a network-based format + /** Start/resume playing - only meaningful if using a network-based format (RTSP). */ int (*read_play)(struct AVFormatContext *); - /** Pauses playing - only meaningful if using a network-based format + /** Pause playing - only meaningful if using a network-based format (RTSP). */ int (*read_pause)(struct AVFormatContext *); const struct AVCodecTag * const *codec_tag; /** - * Seeks to timestamp ts. + * Seek to timestamp ts. * Seeking will be done so that the point from which all active streams * can be presented successfully will be closest to ts and within min/max_ts. * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL. @@ -790,8 +790,8 @@ attribute_deprecated AVOutputFormat *gue #endif /** - * Returns the output format in the list of registered output formats - * which best matches the provided parameters, or returns NULL if + * Return the output format in the list of registered output formats + * which best matches the provided parameters, or return NULL if * there is no match. * * @param short_name if non-NULL checks if short_name matches with the @@ -806,14 +806,14 @@ AVOutputFormat *av_guess_format(const ch const char *mime_type); /** - * Guesses the codec ID based upon muxer and filename. + * Guess the codec ID based upon muxer and filename. */ enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, const char *filename, const char *mime_type, enum AVMediaType type); /** - * Sends a nice hexadecimal dump of a buffer to the specified file stream. + * Send a nice hexadecimal dump of a buffer to the specified file stream. * * @param f The file stream pointer where the dump should be sent to. * @param buf buffer @@ -824,7 +824,7 @@ enum CodecID av_guess_codec(AVOutputForm void av_hex_dump(FILE *f, uint8_t *buf, int size); /** - * Sends a nice hexadecimal dump of a buffer to the log. + * Send a nice hexadecimal dump of a buffer to the log. * * @param avcl A pointer to an arbitrary struct of which the first field is a * pointer to an AVClass struct. @@ -838,7 +838,7 @@ void av_hex_dump(FILE *f, uint8_t *buf, void av_hex_dump_log(void *avcl, int level, uint8_t *buf, int size); /** - * Sends a nice dump of a packet to the specified file stream. + * Send a nice dump of a packet to the specified file stream. * * @param f The file stream pointer where the dump should be sent to. * @param pkt packet to dump @@ -847,7 +847,7 @@ void av_hex_dump_log(void *avcl, int lev void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload); /** - * Sends a nice dump of a packet to the log. + * Send a nice dump of a packet to the log. * * @param avcl A pointer to an arbitrary struct of which the first field is a * pointer to an AVClass struct. @@ -859,7 +859,7 @@ void av_pkt_dump(FILE *f, AVPacket *pkt, void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, int dump_payload); /** - * Initializes libavformat and registers all the muxers, demuxers and + * Initialize libavformat and register all the muxers, demuxers and * protocols. If you do not call this function, then you can select * exactly which formats you want to support. * @@ -870,7 +870,7 @@ void av_pkt_dump_log(void *avcl, int lev void av_register_all(void); /** - * Gets the CodecID for the given codec tag tag. + * Get the CodecID for the given codec tag tag. * If no codec id is found returns CODEC_ID_NONE. * * @param tags list of supported codec_id-codec_tag pairs, as stored @@ -879,7 +879,7 @@ void av_register_all(void); enum CodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag); /** - * Gets the codec tag for the given codec id id. + * Get the codec tag for the given codec id id. * If no codec tag is found returns 0. * * @param tags list of supported codec_id-codec_tag pairs, as stored @@ -890,12 +890,12 @@ unsigned int av_codec_get_tag(const stru /* media file input */ /** - * Finds AVInputFormat based on the short name of the input format. + * Find AVInputFormat based on the short name of the input format. */ AVInputFormat *av_find_input_format(const char *short_name); /** - * Guesses the file format. + * Guess the file format. * * @param is_opened Whether the file is already opened; determines whether * demuxers with or without AVFMT_NOFILE are probed. @@ -903,7 +903,7 @@ AVInputFormat *av_find_input_format(cons AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened); /** - * Guesses the file format. + * Guess the file format. * * @param is_opened Whether the file is already opened; determines whether * demuxers with or without AVFMT_NOFILE are probed. @@ -916,7 +916,7 @@ AVInputFormat *av_probe_input_format(AVP AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max); /** - * Allocates all the structures needed to read an input stream. + * Allocate all the structures needed to read an input stream. * This does not open the needed codecs for decoding the stream[s]. */ int av_open_input_stream(AVFormatContext **ic_ptr, @@ -924,7 +924,7 @@ int av_open_input_stream(AVFormatContext AVInputFormat *fmt, AVFormatParameters *ap); /** - * Opens a media file as input. The codecs are not opened. Only the file + * Open a media file as input. The codecs are not opened. Only the file * header (if present) is read. * * @param ic_ptr The opened media file handle is put here. @@ -948,14 +948,14 @@ attribute_deprecated AVFormatContext *av #endif /** - * Allocates an AVFormatContext. + * Allocate an AVFormatContext. * Can be freed with av_free() but do not forget to free everything you * explicitly allocated as well! */ AVFormatContext *avformat_alloc_context(void); /** - * Reads packets of a media file to get stream information. This + * Read packets of a media file to get stream information. This * is useful for file formats with no headers such as MPEG. This * function also computes the real framerate in case of MPEG-2 repeat * frame mode. @@ -970,7 +970,7 @@ AVFormatContext *avformat_alloc_context( int av_find_stream_info(AVFormatContext *ic); /** - * Reads a transport packet from a media file. + * Read a transport packet from a media file. * * This function is obsolete and should never be used. * Use av_read_frame() instead. @@ -982,7 +982,7 @@ int av_find_stream_info(AVFormatContext int av_read_packet(AVFormatContext *s, AVPacket *pkt); /** - * Returns the next frame of a stream. + * Return the next frame of a stream. * * The returned packet is valid * until the next av_read_frame() or until av_close_input_file() and @@ -1003,7 +1003,7 @@ int av_read_packet(AVFormatContext *s, A int av_read_frame(AVFormatContext *s, AVPacket *pkt); /** - * Seeks to the keyframe at timestamp. + * Seek to the keyframe at timestamp. * 'timestamp' in 'stream_index'. * @param stream_index If stream_index is (-1), a default * stream is selected, and timestamp is automatically converted @@ -1017,7 +1017,7 @@ int av_seek_frame(AVFormatContext *s, in int flags); /** - * Seeks to timestamp ts. + * Seek to timestamp ts. * Seeking will be done so that the point from which all active streams * can be presented successfully will be closest to ts and within min/max_ts. * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL. @@ -1045,33 +1045,33 @@ int av_seek_frame(AVFormatContext *s, in int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags); /** - * Starts playing a network-based stream (e.g. RTSP stream) at the + * Start playing a network-based stream (e.g. RTSP stream) at the * current position. */ int av_read_play(AVFormatContext *s); /** - * Pauses a network-based stream (e.g. RTSP stream). + * Pause a network-based stream (e.g. RTSP stream). * * Use av_read_play() to resume it. */ int av_read_pause(AVFormatContext *s); /** - * Frees a AVFormatContext allocated by av_open_input_stream. + * Free a AVFormatContext allocated by av_open_input_stream. * @param s context to free */ void av_close_input_stream(AVFormatContext *s); /** - * Closes a media file (but not its codecs). + * Close a media file (but not its codecs). * * @param s media file handle */ void av_close_input_file(AVFormatContext *s); /** - * Adds a new stream to a media file. + * Add a new stream to a media file. * * Can only be called in the read_header() function. If the flag * AVFMTCTX_NOHEADER is in the format context, then new streams @@ -1084,7 +1084,7 @@ AVStream *av_new_stream(AVFormatContext AVProgram *av_new_program(AVFormatContext *s, int id); /** - * Adds a new chapter. + * Add a new chapter. * This function is NOT part of the public API * and should ONLY be used by demuxers. * @@ -1100,7 +1100,7 @@ AVChapter *ff_new_chapter(AVFormatContex int64_t start, int64_t end, const char *title); /** - * Sets the pts for a given stream. + * Set the pts for a given stream. * * @param s stream * @param pts_wrap_bits number of bits effectively used by the pts @@ -1119,7 +1119,7 @@ void av_set_pts_info(AVStream *s, int pt int av_find_default_stream_index(AVFormatContext *s); /** - * Gets the index for a specific timestamp. + * Get the index for a specific timestamp. * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond * to the timestamp which is <= the requested one, if backward * is 0, then it will be >= @@ -1129,7 +1129,7 @@ int av_find_default_stream_index(AVForma int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags); /** - * Ensures the index uses less memory than the maximum specified in + * Ensure the index uses less memory than the maximum specified in * AVFormatContext.max_index_size by discarding entries if it grows * too large. * This function is not part of the public API and should only be called @@ -1138,7 +1138,7 @@ int av_index_search_timestamp(AVStream * void ff_reduce_index(AVFormatContext *s, int stream_index); /** - * Adds an index entry into a sorted list. Updates the entry if the list + * Add an index entry into a sorted list. Update the entry if the list * already contains it. * * @param timestamp timestamp in the time base of the given stream @@ -1147,7 +1147,7 @@ int av_add_index_entry(AVStream *st, int int size, int distance, int flags); /** - * Does a binary search using av_index_search_timestamp() and + * Perform a binary search using av_index_search_timestamp() and * AVCodec.read_timestamp(). * This is not supposed to be called directly by a user application, * but by demuxers. @@ -1158,7 +1158,7 @@ int av_seek_frame_binary(AVFormatContext int64_t target_ts, int flags); /** - * Updates cur_dts of all streams based on the given timestamp and AVStream. + * Update cur_dts of all streams based on the given timestamp and AVStream. * * Stream ref_st unchanged, others set cur_dts in their native time base. * Only needed for timestamp wrapping or if (dts not set and pts!=dts). @@ -1168,7 +1168,7 @@ int av_seek_frame_binary(AVFormatContext void av_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp); /** - * Does a binary search using read_timestamp(). + * Perform a binary search using read_timestamp(). * This is not supposed to be called directly by a user application, * but by demuxers. * @param target_ts target timestamp in the time base of the given stream @@ -1211,7 +1211,7 @@ void av_url_split(char *proto, i const char *url); /** - * Allocates the stream private data and writes the stream header to an + * Allocate the stream private data and write the stream header to an * output media file. * * @param s media file handle @@ -1220,7 +1220,7 @@ void av_url_split(char *proto, i int av_write_header(AVFormatContext *s); /** - * Writes a packet to an output media file. + * Write a packet to an output media file. * * The packet shall contain one audio or video frame. * The packet must be correctly interleaved according to the container @@ -1234,7 +1234,7 @@ int av_write_header(AVFormatContext *s); int av_write_frame(AVFormatContext *s, AVPacket *pkt); /** - * Writes a packet to an output media file ensuring correct interleaving. + * Write a packet to an output media file ensuring correct interleaving. * * The packet must contain one audio or video frame. * If the packets are already correctly interleaved, the application should @@ -1251,7 +1251,7 @@ int av_write_frame(AVFormatContext *s, A int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt); /** - * Interleaves a packet per dts in an output media file. + * Interleave a packet per dts in an output media file. * * Packets with pkt->destruct == av_destruct_packet will be freed inside this * function, so they cannot be used after it. Note that calling av_free_packet() @@ -1269,7 +1269,7 @@ int av_interleave_packet_per_dts(AVForma AVPacket *pkt, int flush); /** - * Writes the stream trailer to an output media file and frees the + * Write the stream trailer to an output media file and free the * file private data. * * May only be called after a successful call to av_write_header. @@ -1286,14 +1286,14 @@ void dump_format(AVFormatContext *ic, #if LIBAVFORMAT_VERSION_MAJOR < 53 /** - * Parses width and height out of string str. + * Parse width and height out of string str. * @deprecated Use av_parse_video_frame_size instead. */ attribute_deprecated int parse_image_size(int *width_ptr, int *height_ptr, const char *str); /** - * Converts framerate from a string to a fraction. + * Convert framerate from a string to a fraction. * @deprecated Use av_parse_video_frame_rate instead. */ attribute_deprecated int parse_frame_rate(int *frame_rate, int *frame_rate_base, @@ -1301,7 +1301,7 @@ attribute_deprecated int parse_frame_rat #endif /** - * Parses datestr and returns a corresponding number of microseconds. + * Parse datestr and return a corresponding number of microseconds. * @param datestr String representing a date or a duration. * - If a date the syntax is: * @code @@ -1312,7 +1312,7 @@ attribute_deprecated int parse_frame_rat * interpreted as UTC. * If the year-month-day part is not specified it takes the current * year-month-day. - * Returns the number of microseconds since 1st of January, 1970 up to + * @return the number of microseconds since 1st of January, 1970 up to * the time of the parsed date or INT64_MIN if datestr cannot be * successfully parsed. * - If a duration the syntax is: @@ -1320,7 +1320,7 @@ attribute_deprecated int parse_frame_rat * [-]HH[:MM[:SS[.m...]]] * [-]S+[.m...] * @endcode - * Returns the number of microseconds contained in a time interval + * @return the number of microseconds contained in a time interval * with the specified duration or INT64_MIN if datestr cannot be * successfully parsed. * @param duration Flag which tells how to interpret datestr, if @@ -1329,7 +1329,7 @@ attribute_deprecated int parse_frame_rat */ int64_t parse_date(const char *datestr, int duration); -/** Gets the current time in microseconds. */ +/** Get the current time in microseconds. */ int64_t av_gettime(void); /* ffm-specific for ffserver */ @@ -1339,7 +1339,7 @@ int ffm_write_write_index(int fd, int64_ void ffm_set_write_index(AVFormatContext *s, int64_t pos, int64_t file_size); /** - * Attempts to find a specific tag in a URL. + * Attempt to find a specific tag in a URL. * * syntax: '?tag1=val1&tag2=val2...'. Little URL decoding is done. * Return 1 if found. @@ -1347,7 +1347,7 @@ void ffm_set_write_index(AVFormatContext int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info); /** - * Returns in 'buf' the path with '%d' replaced by a number. + * Return in 'buf' the path with '%d' replaced by a number. * * Also handles the '%0nd' format where 'n' is the total number * of digits and '%%'. @@ -1362,7 +1362,7 @@ int av_get_frame_filename(char *buf, int const char *path, int number); /** - * Checks whether filename actually is a numbered sequence generator. + * Check whether filename actually is a numbered sequence generator. * * @param filename possible numbered sequence string * @return 1 if a valid numbered sequence string, 0 otherwise @@ -1370,7 +1370,7 @@ int av_get_frame_filename(char *buf, int int av_filename_number_test(const char *filename); /** - * Generates an SDP for an RTP session. + * Generate an SDP for an RTP session. * * @param ac array of AVFormatContexts describing the RTP streams. If the * array is composed by only one context, such context can contain @@ -1386,7 +1386,7 @@ int av_filename_number_test(const char * int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size); /** - * Returns a positive value if the given filename has one of the given + * Return a positive value if the given filename has one of the given * extensions, 0 otherwise. * * @param extensions a comma-separated list of filename extensions Modified: trunk/libavformat/avio.h ============================================================================== --- trunk/libavformat/avio.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavformat/avio.h Wed Jun 30 17:38:06 2010 (r23904) @@ -68,8 +68,8 @@ typedef struct URLPollEntry { typedef int URLInterruptCB(void); /** - * Creates an URLContext for accessing to the resource indicated by - * url, and opens it using the URLProtocol up. + * Create a URLContext for accessing to the resource indicated by + * url, and open it using the URLProtocol up. * * @param puc pointer to the location where, in case of success, the * function puts the pointer to the created URLContext @@ -82,8 +82,8 @@ int url_open_protocol (URLContext **puc, const char *url, int flags); /** - * Creates an URLContext for accessing to the resource indicated by - * url, but doesn't initiate the connection yet. + * Create a URLContext for accessing to the resource indicated by + * url, but do not initiate the connection yet. * * @param puc pointer to the location where, in case of success, the * function puts the pointer to the created URLContext @@ -100,8 +100,8 @@ int url_alloc(URLContext **h, const char int url_connect(URLContext *h); /** - * Creates an URLContext for accessing to the resource indicated by - * url, and opens it. + * Create an URLContext for accessing to the resource indicated by + * url, and open it. * * @param puc pointer to the location where, in case of success, the * function puts the pointer to the created URLContext @@ -113,7 +113,7 @@ int url_connect(URLContext *h); int url_open(URLContext **h, const char *url, int flags); /** - * Reads up to size bytes from the resource accessed by h, and stores + * Read up to size bytes from the resource accessed by h, and store * the read bytes in buf. * * @return The number of bytes actually read, or a negative value @@ -135,7 +135,7 @@ int url_read_complete(URLContext *h, uns int url_write(URLContext *h, const unsigned char *buf, int size); /** - * Changes the position that will be used by the next read/write + * Change the position that will be used by the next read/write * operation on the resource accessed by h. * * @param pos specifies the new position to set @@ -151,7 +151,7 @@ int url_write(URLContext *h, const unsig int64_t url_seek(URLContext *h, int64_t pos, int whence); /** - * Closes the resource accessed by the URLContext h, and frees the + * Close the resource accessed by the URLContext h, and free the * memory used by it. * * @return a negative value if an error condition occurred, 0 @@ -160,7 +160,7 @@ int64_t url_seek(URLContext *h, int64_t int url_close(URLContext *h); /** - * Returns a non-zero value if the resource indicated by url + * Return a non-zero value if the resource indicated by url * exists, 0 otherwise. */ int url_exist(const char *url); @@ -282,7 +282,7 @@ attribute_deprecated int av_register_pro #endif /** - * Registers the URLProtocol protocol. + * Register the URLProtocol protocol. * * @param size the size of the URLProtocol struct referenced */ @@ -368,7 +368,7 @@ void url_fskip(ByteIOContext *s, int64_t int64_t url_ftell(ByteIOContext *s); /** - * Gets the filesize. + * Get the filesize. * @return filesize or AVERROR */ int64_t url_fsize(ByteIOContext *s); @@ -404,13 +404,13 @@ void put_flush_packet(ByteIOContext *s); /** - * Reads size bytes from ByteIOContext into buf. + * Read size bytes from ByteIOContext into buf. * @return number of bytes read or AVERROR */ int get_buffer(ByteIOContext *s, unsigned char *buf, int size); /** - * Reads size bytes from ByteIOContext into buf. + * Read size bytes from ByteIOContext into buf. * This reads at most 1 packet. If that is not enough fewer bytes will be * returned. * @return number of bytes read or AVERROR @@ -439,7 +439,7 @@ static inline int url_is_streamed(ByteIO } /** - * Creates and initializes a ByteIOContext for accessing the + * Create and initialize a ByteIOContext for accessing the * resource referenced by the URLContext h. * @note When the URLContext h has been opened in read+write mode, the * ByteIOContext can be used only for writing. @@ -462,7 +462,7 @@ int url_resetbuf(ByteIOContext *s, int f #endif /** - * Rewinds the ByteIOContext using the specified buffer containing the first buf_size bytes of the file. + * Rewind the ByteIOContext using the specified buffer containing the first buf_size bytes of the file. * Used after probing to avoid seeking. * Joins buf and s->buffer, taking any overlap into consideration. * @note s->buffer must overlap with buf or they can't be joined and the function fails @@ -477,7 +477,7 @@ int url_resetbuf(ByteIOContext *s, int f int ff_rewind_with_probe_data(ByteIOContext *s, unsigned char *buf, int buf_size); /** - * Creates and initializes a ByteIOContext for accessing the + * Create and initialize a ByteIOContext for accessing the * resource indicated by url. * @note When the resource indicated by url has been opened in * read+write mode, the ByteIOContext can be used only for writing. Modified: trunk/libavformat/avlanguage.h ============================================================================== --- trunk/libavformat/avlanguage.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavformat/avlanguage.h Wed Jun 30 17:38:06 2010 (r23904) @@ -31,8 +31,8 @@ enum AVLangCodespace { }; /** - * Converts a language code to a target codespace. The source codespace is guessed. - * Returns NULL if the provided lang is null or invalid. + * Convert a language code to a target codespace. The source codespace is guessed. + * @return NULL if the provided lang is null or invalid. */ const char *av_convert_lang_to(const char *lang, enum AVLangCodespace target_codespace); Modified: trunk/libavformat/http.h ============================================================================== --- trunk/libavformat/http.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavformat/http.h Wed Jun 30 17:38:06 2010 (r23904) @@ -25,7 +25,7 @@ #include "avio.h" /** - * Sets custom HTTP headers. + * Set custom HTTP headers. * A trailing CRLF ("\r\n") is required for custom headers. * Passing in an empty header string ("\0") will reset to defaults. * @@ -43,7 +43,7 @@ void ff_http_set_headers(URLContext *h, const char *headers); /** - * Enables or disables chunked transfer encoding. (default is enabled) + * Enable or disable chunked transfer encoding. (default is enabled) * * @param h URL context for this HTTP connection * @param is_chunked 0 to disable chunking, nonzero otherwise. Modified: trunk/libavformat/id3v2.h ============================================================================== --- trunk/libavformat/id3v2.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavformat/id3v2.h Wed Jun 30 17:38:06 2010 (r23904) @@ -34,7 +34,7 @@ #define ID3v2_DEFAULT_MAGIC "ID3" /** - * Detects ID3v2 Header. + * Detect ID3v2 Header. * @buf must be ID3v2_HEADER_SIZE byte long * @magic magic bytes to identify the header, machine byte order. * If in doubt, use ID3v2_DEFAULT_MAGIC. @@ -42,7 +42,7 @@ int ff_id3v2_match(const uint8_t *buf, const char *magic); /** - * Gets the length of an ID3v2 tag. + * Get the length of an ID3v2 tag. * @buf must be ID3v2_HEADER_SIZE bytes long and point to the start of an * already detected ID3v2 tag */ Modified: trunk/libavformat/internal.h ============================================================================== --- trunk/libavformat/internal.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavformat/internal.h Wed Jun 30 17:38:06 2010 (r23904) @@ -67,11 +67,11 @@ void ff_read_frame_flush(AVFormatContext #define NTP_OFFSET 2208988800ULL #define NTP_OFFSET_US (NTP_OFFSET * 1000000ULL) -/** Gets the current time since NTP epoch in microseconds. */ +/** Get the current time since NTP epoch in microseconds. */ uint64_t ff_ntp_time(void); /** - * Probes a bytestream to determine the input format. Each time a probe returns + * Probe a bytestream to determine the input format. Each time a probe returns * with a score that is too low, the probe buffer size is increased and another * attempt is made. When the maximum probe size is reached, the input format * with the highest score is returned. @@ -102,7 +102,7 @@ void ff_url_split(char *proto, int proto #endif /** - * Assembles a URL string from components. This is the reverse operation + * Assemble a URL string from components. This is the reverse operation * of av_url_split. * * Note, this requires networking to be initialized, so the caller must @@ -127,7 +127,7 @@ int ff_url_join(char *str, int size, con int port, const char *fmt, ...); /** - * Appends the media-specific SDP fragment for the media stream c + * Append the media-specific SDP fragment for the media stream c * to the buffer buff. * * Note, the buffer needs to be initialized, since it is appended to Modified: trunk/libavformat/librtmp.c ============================================================================== --- trunk/libavformat/librtmp.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavformat/librtmp.c Wed Jun 30 17:38:06 2010 (r23904) @@ -55,7 +55,7 @@ static int rtmp_close(URLContext *s) } /** - * Opens RTMP connection and verifies that the stream can be played. + * Open RTMP connection and verify that the stream can be played. * * URL syntax: rtmp://server[:port][/app][/playpath][ keyword=value]... * where 'app' is first one or two directories in the path Modified: trunk/libavformat/matroskaenc.c ============================================================================== --- trunk/libavformat/matroskaenc.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavformat/matroskaenc.c Wed Jun 30 17:38:06 2010 (r23904) @@ -193,7 +193,7 @@ static void put_ebml_string(ByteIOContex } /** - * Writes a void element of a given size. Useful for reserving space in + * Write a void element of a given size. Useful for reserving space in * the file to be written to later. * * @param size The number of bytes to reserve, which must be at least 2. Modified: trunk/libavformat/mpeg.c ============================================================================== --- trunk/libavformat/mpeg.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavformat/mpeg.c Wed Jun 30 17:38:06 2010 (r23904) @@ -196,7 +196,7 @@ static int find_prev_start_code(ByteIOCo #endif /** - * Extracts stream types from a program stream map + * Extract stream types from a program stream map * According to ISO/IEC 13818-1 ('MPEG-2 Systems') table 2-35 * * @return number of bytes occupied by PSM in the bitstream Modified: trunk/libavformat/mpegts.c ============================================================================== --- trunk/libavformat/mpegts.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavformat/mpegts.c Wed Jun 30 17:38:06 2010 (r23904) @@ -239,7 +239,7 @@ static int discard_pid(MpegTSContext *ts } /** - * Assembles PES packets out of TS packets, and then calls the "section_cb" + * Assemble PES packets out of TS packets, and then call the "section_cb" * function when they are complete. */ static void write_section_data(AVFormatContext *s, MpegTSFilter *tss1, Modified: trunk/libavformat/nutenc.c ============================================================================== --- trunk/libavformat/nutenc.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavformat/nutenc.c Wed Jun 30 17:38:06 2010 (r23904) @@ -242,7 +242,7 @@ static void build_frame_code(AVFormatCon } /** - * Gets the length in bytes which is needed to store val as v. + * Get the length in bytes which is needed to store val as v. */ static int get_length(uint64_t val){ int i=1; @@ -269,7 +269,7 @@ static void put_tt(NUTContext *nut, Stre } /** - * Stores a string as vb. + * Store a string as vb. */ static void put_str(ByteIOContext *bc, const char *string){ int len= strlen(string); Modified: trunk/libavformat/rtmppkt.h ============================================================================== --- trunk/libavformat/rtmppkt.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavformat/rtmppkt.h Wed Jun 30 17:38:06 2010 (r23904) @@ -83,7 +83,7 @@ typedef struct RTMPPacket { } RTMPPacket; /** - * Creates new RTMP packet with given attributes. + * Create new RTMP packet with given attributes. * * @param pkt packet * @param channel_id packet channel ID @@ -96,14 +96,14 @@ int ff_rtmp_packet_create(RTMPPacket *pk int timestamp, int size); /** - * Frees RTMP packet. + * Free RTMP packet. * * @param pkt packet */ void ff_rtmp_packet_destroy(RTMPPacket *pkt); /** - * Reads RTMP packet sent by the server. + * Read RTMP packet sent by the server. * * @param h reader context * @param p packet @@ -116,7 +116,7 @@ int ff_rtmp_packet_read(URLContext *h, R int chunk_size, RTMPPacket *prev_pkt); /** - * Sends RTMP packet to the server. + * Send RTMP packet to the server. * * @param h reader context * @param p packet to send @@ -129,7 +129,7 @@ int ff_rtmp_packet_write(URLContext *h, int chunk_size, RTMPPacket *prev_pkt); /** - * Prints information and contents of RTMP packet. + * Print information and contents of RTMP packet. * * @param h output context * @param p packet to dump @@ -143,7 +143,7 @@ void ff_rtmp_packet_dump(void *ctx, RTMP */ /** - * Calculates number of bytes taken by first AMF entry in data. + * Calculate number of bytes taken by first AMF entry in data. * * @param data input data * @param data_end input buffer end @@ -152,7 +152,7 @@ void ff_rtmp_packet_dump(void *ctx, RTMP int ff_amf_tag_size(const uint8_t *data, const uint8_t *data_end); /** - * Retrieves value of given AMF object field in string form. + * Retrieve value of given AMF object field in string form. * * @param data AMF object data * @param data_end input buffer end @@ -165,7 +165,7 @@ int ff_amf_get_field_value(const uint8_t const uint8_t *name, uint8_t *dst, int dst_size); /** - * Writes boolean value in AMF format to buffer. + * Write boolean value in AMF format to buffer. * * @param dst pointer to the input buffer (will be modified) * @param val value to write @@ -173,7 +173,7 @@ int ff_amf_get_field_value(const uint8_t void ff_amf_write_bool(uint8_t **dst, int val); /** - * Writes number in AMF format to buffer. + * Write number in AMF format to buffer. * * @param dst pointer to the input buffer (will be modified) * @param num value to write @@ -181,7 +181,7 @@ void ff_amf_write_bool(uint8_t **dst, in void ff_amf_write_number(uint8_t **dst, double num); /** - * Writes string in AMF format to buffer. + * Write string in AMF format to buffer. * * @param dst pointer to the input buffer (will be modified) * @param str string to write @@ -189,21 +189,21 @@ void ff_amf_write_number(uint8_t **dst, void ff_amf_write_string(uint8_t **dst, const char *str); /** - * Writes AMF NULL value to buffer. + * Write AMF NULL value to buffer. * * @param dst pointer to the input buffer (will be modified) */ void ff_amf_write_null(uint8_t **dst); /** - * Writes marker for AMF object to buffer. + * Write marker for AMF object to buffer. * * @param dst pointer to the input buffer (will be modified) */ void ff_amf_write_object_start(uint8_t **dst); /** - * Writes string used as field name in AMF object to buffer. + * Write string used as field name in AMF object to buffer. * * @param dst pointer to the input buffer (will be modified) * @param str string to write @@ -211,7 +211,7 @@ void ff_amf_write_object_start(uint8_t * void ff_amf_write_field_name(uint8_t **dst, const char *str); /** - * Writes marker for end of AMF object to buffer. + * Write marker for end of AMF object to buffer. * * @param dst pointer to the input buffer (will be modified) */ Modified: trunk/libavformat/rtmpproto.c ============================================================================== --- trunk/libavformat/rtmpproto.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavformat/rtmpproto.c Wed Jun 30 17:38:06 2010 (r23904) @@ -102,7 +102,7 @@ static const uint8_t rtmp_server_key[] = }; /** - * Generates 'connect' call and sends it to the server. + * Generate 'connect' call and send it to the server. */ static void gen_connect(URLContext *s, RTMPContext *rt, const char *proto, const char *host, int port) @@ -154,7 +154,7 @@ static void gen_connect(URLContext *s, R } /** - * Generates 'releaseStream' call and sends it to the server. It should make + * Generate 'releaseStream' call and send it to the server. It should make * the server release some channel for media streams. */ static void gen_release_stream(URLContext *s, RTMPContext *rt) @@ -177,7 +177,7 @@ static void gen_release_stream(URLContex } /** - * Generates 'FCPublish' call and sends it to the server. It should make + * Generate 'FCPublish' call and send it to the server. It should make * the server preapare for receiving media streams. */ static void gen_fcpublish_stream(URLContext *s, RTMPContext *rt) @@ -200,7 +200,7 @@ static void gen_fcpublish_stream(URLCont } /** - * Generates 'FCUnpublish' call and sends it to the server. It should make + * Generate 'FCUnpublish' call and send it to the server. It should make * the server destroy stream. */ static void gen_fcunpublish_stream(URLContext *s, RTMPContext *rt) @@ -223,7 +223,7 @@ static void gen_fcunpublish_stream(URLCo } /** - * Generates 'createStream' call and sends it to the server. It should make + * Generate 'createStream' call and send it to the server. It should make * the server allocate some channel for media streams. */ static void gen_create_stream(URLContext *s, RTMPContext *rt) @@ -245,7 +245,7 @@ static void gen_create_stream(URLContext /** - * Generates 'deleteStream' call and sends it to the server. It should make + * Generate 'deleteStream' call and send it to the server. It should make * the server remove some channel for media streams. */ static void gen_delete_stream(URLContext *s, RTMPContext *rt) @@ -267,7 +267,7 @@ static void gen_delete_stream(URLContext } /** - * Generates 'play' call and sends it to the server, then pings the server + * Generate 'play' call and send it to the server, then ping the server * to start actual playing. */ static void gen_play(URLContext *s, RTMPContext *rt) @@ -302,7 +302,7 @@ static void gen_play(URLContext *s, RTMP } /** - * Generates 'publish' call and sends it to the server. + * Generate 'publish' call and send it to the server. */ static void gen_publish(URLContext *s, RTMPContext *rt) { @@ -326,7 +326,7 @@ static void gen_publish(URLContext *s, R } /** - * Generates ping reply and sends it to the server. + * Generate ping reply and send it to the server. */ static void gen_pong(URLContext *s, RTMPContext *rt, RTMPPacket *ppkt) { @@ -342,7 +342,7 @@ static void gen_pong(URLContext *s, RTMP } /** - * Generates report on bytes read so far and sends it to the server. + * Generate report on bytes read so far and send it to the server. */ static void gen_bytes_read(URLContext *s, RTMPContext *rt, uint32_t ts) { @@ -361,7 +361,7 @@ static void gen_bytes_read(URLContext *s #define HMAC_OPAD_VAL 0x5C /** - * Calculates HMAC-SHA2 digest for RTMP handshake packets. + * Calculate HMAC-SHA2 digest for RTMP handshake packets. * * @param src input buffer * @param len input buffer length (should be 1536) @@ -410,7 +410,7 @@ static void rtmp_calc_digest(const uint8 } /** - * Puts HMAC-SHA2 digest of packet data (except for the bytes where this digest + * Put HMAC-SHA2 digest of packet data (except for the bytes where this digest * will be stored) into that packet. * * @param buf handshake data (1536 bytes) @@ -431,7 +431,7 @@ static int rtmp_handshake_imprint_with_d } /** - * Verifies that the received server response has the expected digest value. + * Verify that the received server response has the expected digest value. * * @param buf handshake data received from the server (1536 bytes) * @param off position to search digest offset from @@ -455,7 +455,7 @@ static int rtmp_validate_digest(uint8_t } /** - * Performs handshake with the server by means of exchanging pseudorandom data + * Perform handshake with the server by means of exchanging pseudorandom data * signed with HMAC-SHA2 digest. * * @return 0 if handshake succeeds, negative value otherwise @@ -540,7 +540,7 @@ static int rtmp_handshake(URLContext *s, } /** - * Parses received packet and may perform some action depending on + * Parse received packet and possibly perform some action depending on * the packet contents. * @return 0 for no errors, negative values for serious errors which prevent * further communications, positive values for uncritical errors @@ -666,7 +666,7 @@ static int rtmp_parse_result(URLContext } /** - * Interacts with the server by receiving and sending RTMP packets until + * Interact with the server by receiving and sending RTMP packets until * there is some significant data (media data or expected status notification). * * @param s reading context @@ -791,7 +791,7 @@ static int rtmp_close(URLContext *h) } /** - * Opens RTMP connection and verifies that the stream can be played. + * Open RTMP connection and verify that the stream can be played. * * URL syntax: rtmp://server[:port][/app][/playpath] * where 'app' is first one or two directories in the path Modified: trunk/libavformat/utils.c ============================================================================== --- trunk/libavformat/utils.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavformat/utils.c Wed Jun 30 17:38:06 2010 (r23904) @@ -1745,7 +1745,7 @@ int avformat_seek_file(AVFormatContext * /*******************************************************/ /** - * Returns TRUE if the stream has accurate duration in any stream. + * Return TRUE if the stream has accurate duration in any stream. * * @return TRUE if the stream has accurate duration for at least one component. */ @@ -2924,7 +2924,7 @@ int av_interleave_packet_per_dts(AVForma } /** - * Interleaves an AVPacket correctly so it can be muxed. + * Interleave an AVPacket correctly so it can be muxed. * @param out the interleaved packet will be output here * @param in the input packet * @param flush 1 if no further packets are available as input and all Modified: trunk/libavformat/vorbiscomment.h ============================================================================== --- trunk/libavformat/vorbiscomment.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavformat/vorbiscomment.h Wed Jun 30 17:38:06 2010 (r23904) @@ -26,7 +26,7 @@ #include "metadata.h" /** - * Calculates the length in bytes of a VorbisComment. This is the minimum + * Calculate the length in bytes of a VorbisComment. This is the minimum * size required by ff_vorbiscomment_write(). * * @param m The metadata structure to be parsed. For no metadata, set to NULL. Modified: trunk/libavutil/aes.h ============================================================================== --- trunk/libavutil/aes.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/aes.h Wed Jun 30 17:38:06 2010 (r23904) @@ -28,14 +28,14 @@ extern const int av_aes_size; struct AVAES; /** - * Initializes an AVAES context. + * Initialize an AVAES context. * @param key_bits 128, 192 or 256 * @param decrypt 0 for encryption, 1 for decryption */ int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt); /** - * Encrypts / decrypts. + * Encrypt / decrypt. * @param count number of 16 byte blocks * @param dst destination array, can be equal to src * @param src source array, can be equal to dst Modified: trunk/libavutil/avutil.h ============================================================================== --- trunk/libavutil/avutil.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/avutil.h Wed Jun 30 17:38:06 2010 (r23904) @@ -54,17 +54,17 @@ #define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION) /** - * Returns the LIBAVUTIL_VERSION_INT constant. + * Return the LIBAVUTIL_VERSION_INT constant. */ unsigned avutil_version(void); /** - * Returns the libavutil build-time configuration. + * Return the libavutil build-time configuration. */ const char *avutil_configuration(void); /** - * Returns the libavutil license. + * Return the libavutil license. */ const char *avutil_license(void); Modified: trunk/libavutil/base64.h ============================================================================== --- trunk/libavutil/base64.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/base64.h Wed Jun 30 17:38:06 2010 (r23904) @@ -24,7 +24,7 @@ #include <stdint.h> /** - * Decodes the base64-encoded string in in and puts the decoded + * Decode the base64-encoded string in in and put the decoded * data in out. * * @param out_size size in bytes of the out buffer, it should be at @@ -35,7 +35,7 @@ int av_base64_decode(uint8_t *out, const char *in, int out_size); /** - * Encodes in base64 the data in in and puts the resulting string + * Encode in base64 the data in in and put the resulting string * in out. * * @param out_size size in bytes of the out string, it should be at Modified: trunk/libavutil/common.h ============================================================================== --- trunk/libavutil/common.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/common.h Wed Jun 30 17:38:06 2010 (r23904) @@ -98,7 +98,7 @@ static inline av_const int av_log2_16bit #endif /** - * Clips a signed integer value into the amin-amax range. + * Clip a signed integer value into the amin-amax range. * @param a value to clip * @param amin minimum value of the clip range * @param amax maximum value of the clip range @@ -112,7 +112,7 @@ static inline av_const int av_clip(int a } /** - * Clips a signed integer value into the 0-255 range. + * Clip a signed integer value into the 0-255 range. * @param a value to clip * @return clipped value */ @@ -123,7 +123,7 @@ static inline av_const uint8_t av_clip_u } /** - * Clips a signed integer value into the -128,127 range. + * Clip a signed integer value into the -128,127 range. * @param a value to clip * @return clipped value */ @@ -134,7 +134,7 @@ static inline av_const int8_t av_clip_in } /** - * Clips a signed integer value into the 0-65535 range. + * Clip a signed integer value into the 0-65535 range. * @param a value to clip * @return clipped value */ @@ -145,7 +145,7 @@ static inline av_const uint16_t av_clip_ } /** - * Clips a signed integer value into the -32768,32767 range. + * Clip a signed integer value into the -32768,32767 range. * @param a value to clip * @return clipped value */ @@ -156,7 +156,7 @@ static inline av_const int16_t av_clip_i } /** - * Clips a signed 64-bit integer value into the -2147483648,2147483647 range. + * Clip a signed 64-bit integer value into the -2147483648,2147483647 range. * @param a value to clip * @return clipped value */ @@ -167,7 +167,7 @@ static inline av_const int32_t av_clipl_ } /** - * Clips a float value into the amin-amax range. + * Clip a float value into the amin-amax range. * @param a value to clip * @param amin minimum value of the clip range * @param amax maximum value of the clip range @@ -180,7 +180,7 @@ static inline av_const float av_clipf(fl else return a; } -/** Computes ceil(log2(x)). +/** Compute ceil(log2(x)). * @param x value used to compute ceil(log2(x)) * @return computed ceiling of log2(x) */ @@ -194,7 +194,7 @@ static inline av_const int av_ceil_log2( /*! * \def GET_UTF8(val, GET_BYTE, ERROR) - * Converts a UTF-8 character (up to 4 bytes long) to its 32-bit UCS-4 encoded form + * Convert a UTF-8 character (up to 4 bytes long) to its 32-bit UCS-4 encoded form * \param val is the output and should be of type uint32_t. It holds the converted * UCS-4 character and should be a left value. * \param GET_BYTE gets UTF-8 encoded bytes from any proper source. It can be @@ -222,7 +222,7 @@ static inline av_const int av_ceil_log2( /*! * \def GET_UTF16(val, GET_16BIT, ERROR) - * Converts a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form + * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form * \param val is the output and should be of type uint32_t. It holds the converted * UCS-4 character and should be a left value. * \param GET_16BIT gets two bytes of UTF-16 encoded data converted to native endianness. @@ -246,7 +246,7 @@ static inline av_const int av_ceil_log2( /*! * \def PUT_UTF8(val, tmp, PUT_BYTE) - * Converts a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long). + * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long). * \param val is an input-only argument and should be of type uint32_t. It holds * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If * val is given as a function it is executed only once. @@ -282,7 +282,7 @@ static inline av_const int av_ceil_log2( /*! * \def PUT_UTF16(val, tmp, PUT_16BIT) - * Converts a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes). + * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes). * \param val is an input-only argument and should be of type uint32_t. It holds * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If * val is given as a function it is executed only once. Modified: trunk/libavutil/crc.c ============================================================================== --- trunk/libavutil/crc.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/crc.c Wed Jun 30 17:38:06 2010 (r23904) @@ -41,7 +41,7 @@ static AVCRC av_crc_table[AV_CRC_MAX][25 #endif /** - * Initializes a CRC table. + * Initialize a CRC table. * @param ctx must be an array of size sizeof(AVCRC)*257 or sizeof(AVCRC)*1024 * @param cts_size size of ctx in bytes * @param le If 1, the lowest bit represents the coefficient for the highest @@ -88,7 +88,7 @@ int av_crc_init(AVCRC *ctx, int le, int } /** - * Gets an initialized standard CRC table. + * Get an initialized standard CRC table. * @param crc_id ID of a standard CRC * @return a pointer to the CRC table or NULL on failure */ @@ -106,7 +106,7 @@ const AVCRC *av_crc_get_table(AVCRCId cr } /** - * Calculates the CRC of a block. + * Calculate the CRC of a block. * @param crc CRC of previous blocks if any or initial value for CRC * @return CRC updated with the data from the given block * Modified: trunk/libavutil/error.h ============================================================================== --- trunk/libavutil/error.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/error.h Wed Jun 30 17:38:06 2010 (r23904) @@ -58,7 +58,7 @@ #endif /** - * Puts a description of the AVERROR code errnum in errbuf. + * Put a description of the AVERROR code errnum in errbuf. * In case of failure the global variable errno is set to indicate the * error. Even in case of failure av_strerror() will print a generic * error message indicating the errnum provided to errbuf. Modified: trunk/libavutil/eval.h ============================================================================== --- trunk/libavutil/eval.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/eval.h Wed Jun 30 17:38:06 2010 (r23904) @@ -29,7 +29,7 @@ typedef struct AVExpr AVExpr; /** - * Parses and evaluates an expression. + * Parse and evaluate an expression. * Note, this is significantly slower than av_eval_expr(). * * @param res a pointer to a double where is put the result value of @@ -53,7 +53,7 @@ int av_parse_and_eval_expr(double *res, void *opaque, int log_offset, void *log_ctx); /** - * Parses an expression. + * Parse an expression. * * @param expr a pointer where is put an AVExpr containing the parsed * value in case of successfull parsing, or NULL otherwise. @@ -76,7 +76,7 @@ int av_parse_expr(AVExpr **expr, const c int log_offset, void *log_ctx); /** - * Evaluates a previously parsed expression. + * Evaluate a previously parsed expression. * * @param const_values a zero terminated array of values for the identifiers from av_parse_expr() const_names * @param opaque a pointer which will be passed to all functions from funcs1 and funcs2 @@ -85,12 +85,12 @@ int av_parse_expr(AVExpr **expr, const c double av_eval_expr(AVExpr *e, const double *const_values, void *opaque); /** - * Frees a parsed expression previously created with av_parse_expr(). + * Free a parsed expression previously created with av_parse_expr(). */ void av_free_expr(AVExpr *e); /** - * Parses the string in numstr and returns its value as a double. If + * Parse the string in numstr and return its value as a double. If * the string is empty, contains only whitespaces, or does not contain * an initial substring that has the expected syntax for a * floating-point number, no conversion is performed. In this case, Modified: trunk/libavutil/fifo.h ============================================================================== --- trunk/libavutil/fifo.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/fifo.h Wed Jun 30 17:38:06 2010 (r23904) @@ -33,26 +33,26 @@ typedef struct AVFifoBuffer { } AVFifoBuffer; /** - * Initializes an AVFifoBuffer. + * Initialize an AVFifoBuffer. * @param size of FIFO * @return AVFifoBuffer or NULL in case of memory allocation failure */ AVFifoBuffer *av_fifo_alloc(unsigned int size); /** - * Frees an AVFifoBuffer. + * Free an AVFifoBuffer. * @param *f AVFifoBuffer to free */ void av_fifo_free(AVFifoBuffer *f); /** - * Resets the AVFifoBuffer to the state right after av_fifo_alloc, in particular it is emptied. + * Reset the AVFifoBuffer to the state right after av_fifo_alloc, in particular it is emptied. * @param *f AVFifoBuffer to reset */ void av_fifo_reset(AVFifoBuffer *f); /** - * Returns the amount of data in bytes in the AVFifoBuffer, that is the + * Return the amount of data in bytes in the AVFifoBuffer, that is the * amount of data you can read from it. * @param *f AVFifoBuffer to read from * @return size @@ -60,7 +60,7 @@ void av_fifo_reset(AVFifoBuffer *f); int av_fifo_size(AVFifoBuffer *f); /** - * Returns the amount of space in bytes in the AVFifoBuffer, that is the + * Return the amount of space in bytes in the AVFifoBuffer, that is the * amount of data you can write into it. * @param *f AVFifoBuffer to write into * @return size @@ -68,7 +68,7 @@ int av_fifo_size(AVFifoBuffer *f); int av_fifo_space(AVFifoBuffer *f); /** - * Feeds data from an AVFifoBuffer to a user-supplied callback. + * Feed data from an AVFifoBuffer to a user-supplied callback. * @param *f AVFifoBuffer to read from * @param buf_size number of bytes to read * @param *func generic read function @@ -77,7 +77,7 @@ int av_fifo_space(AVFifoBuffer *f); int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int)); /** - * Feeds data from a user-supplied callback to an AVFifoBuffer. + * Feed data from a user-supplied callback to an AVFifoBuffer. * @param *f AVFifoBuffer to write to * @param *src data source; non-const since it may be used as a * modifiable context by the function defined in func @@ -92,7 +92,7 @@ int av_fifo_generic_read(AVFifoBuffer *f int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int)); /** - * Resizes an AVFifoBuffer. + * Resize an AVFifoBuffer. * @param *f AVFifoBuffer to resize * @param size new AVFifoBuffer size in bytes * @return <0 for failure, >=0 otherwise @@ -100,7 +100,7 @@ int av_fifo_generic_write(AVFifoBuffer * int av_fifo_realloc2(AVFifoBuffer *f, unsigned int size); /** - * Reads and discards the specified amount of data from an AVFifoBuffer. + * Read and discard the specified amount of data from an AVFifoBuffer. * @param *f AVFifoBuffer to read from * @param size amount of data to read in bytes */ Modified: trunk/libavutil/integer.h ============================================================================== --- trunk/libavutil/integer.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/integer.h Wed Jun 30 17:38:06 2010 (r23904) @@ -41,7 +41,7 @@ AVInteger av_add_i(AVInteger a, AVIntege AVInteger av_sub_i(AVInteger a, AVInteger b) av_const; /** - * Returns the rounded-down value of the base 2 logarithm of the given + * Return the rounded-down value of the base 2 logarithm of the given * AVInteger. This is simply the index of the most significant bit * which is 1, or 0 if all bits are 0. */ @@ -49,7 +49,7 @@ int av_log2_i(AVInteger a) av_const; AVInteger av_mul_i(AVInteger a, AVInteger b) av_const; /** - * Returns 0 if a==b, 1 if a>b and -1 if a<b. + * Return 0 if a==b, 1 if a>b and -1 if a<b. */ int av_cmp_i(AVInteger a, AVInteger b) av_const; @@ -61,23 +61,23 @@ int av_cmp_i(AVInteger a, AVInteger b) a AVInteger av_shr_i(AVInteger a, int s) av_const; /** - * Returns a % b. + * Return a % b. * @param quot a/b will be stored here. */ AVInteger av_mod_i(AVInteger *quot, AVInteger a, AVInteger b); /** - * Returns a/b. + * Return a/b. */ AVInteger av_div_i(AVInteger a, AVInteger b) av_const; /** - * Converts the given int64_t to an AVInteger. + * Convert the given int64_t to an AVInteger. */ AVInteger av_int2i(int64_t a) av_const; /** - * Converts the given AVInteger to an int64_t. + * Convert the given AVInteger to an int64_t. * If the AVInteger is too large to fit into an int64_t, * then only the least significant 64 bits will be used. */ Modified: trunk/libavutil/internal.h ============================================================================== --- trunk/libavutil/internal.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/internal.h Wed Jun 30 17:38:06 2010 (r23904) @@ -48,8 +48,8 @@ /** - * Marks a variable as used and prevents the compiler from optimizing it away. - * This is usefull for asm that accesses varibles in ways that the compiler doesnt + * Mark a variable as used and prevent the compiler from optimizing it away. + * This is useful for asm that accesses varibles in ways that the compiler does not * understand */ #ifndef attribute_used @@ -192,7 +192,7 @@ #include "libm.h" /** - * Returns NULL if CONFIG_SMALL is true, otherwise the argument + * Return NULL if CONFIG_SMALL is true, otherwise the argument * without modification. Used to disable the definition of strings * (for example AVCodec long_names). */ Modified: trunk/libavutil/lfg.h ============================================================================== --- trunk/libavutil/lfg.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/lfg.h Wed Jun 30 17:38:06 2010 (r23904) @@ -30,7 +30,7 @@ typedef struct { void av_lfg_init(AVLFG *c, unsigned int seed); /** - * Gets the next random unsigned 32-bit number using an ALFG. + * Get the next random unsigned 32-bit number using an ALFG. * * Please also consider a simple LCG like state= state*1664525+1013904223, * it may be good enough and faster for your specific use case. @@ -41,7 +41,7 @@ static inline unsigned int av_lfg_get(AV } /** - * Gets the next random unsigned 32-bit number using a MLFG. + * Get the next random unsigned 32-bit number using a MLFG. * * Please also consider av_lfg_get() above, it is faster. */ @@ -52,7 +52,7 @@ static inline unsigned int av_mlfg_get(A } /** - * Gets the next two numbers generated by a Box-Muller Gaussian + * Get the next two numbers generated by a Box-Muller Gaussian * generator using the random numbers issued by lfg. * * @param out[2] array where are placed the two generated numbers Modified: trunk/libavutil/log.h ============================================================================== --- trunk/libavutil/log.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/log.h Wed Jun 30 17:38:06 2010 (r23904) @@ -25,7 +25,7 @@ #include "avutil.h" /** - * Describes the class of an AVClass context structure. That is an + * Describe the class of an AVClass context structure. That is an * arbitrary struct of which the first field is a pointer to an * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.). */ @@ -109,7 +109,7 @@ typedef struct { #define AV_LOG_DEBUG 48 /** - * Sends the specified message to the log if the level is less than or equal + * Send the specified message to the log if the level is less than or equal * to the current av_log_level. By default, all logging messages are sent to * stderr. This behavior can be altered by setting a different av_vlog callback * function. Modified: trunk/libavutil/mathematics.h ============================================================================== --- trunk/libavutil/mathematics.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/mathematics.h Wed Jun 30 17:38:06 2010 (r23904) @@ -63,31 +63,31 @@ enum AVRounding { }; /** - * Returns the greatest common divisor of a and b. + * Return the greatest common divisor of a and b. * If both a and b are 0 or either or both are <0 then behavior is * undefined. */ int64_t av_const av_gcd(int64_t a, int64_t b); /** - * Rescales a 64-bit integer with rounding to nearest. + * Rescale a 64-bit integer with rounding to nearest. * A simple a*b/c isn't possible as it can overflow. */ int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const; /** - * Rescales a 64-bit integer with specified rounding. + * Rescale a 64-bit integer with specified rounding. * A simple a*b/c isn't possible as it can overflow. */ int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_const; /** - * Rescales a 64-bit integer by 2 rational numbers. + * Rescale a 64-bit integer by 2 rational numbers. */ int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const; /** - * Compares 2 timestamps each in its own timebases. + * Compare 2 timestamps each in its own timebases. * The result of the function is undefined if one of the timestamps * is outside the int64_t range when represented in the others timebase. * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position @@ -95,7 +95,7 @@ int64_t av_rescale_q(int64_t a, AVRation int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b); /** - * Compares 2 integers modulo mod. + * Compare 2 integers modulo mod. * That is we compare integers a and b for which only the least * significant log2(mod) bits are known. * Modified: trunk/libavutil/mem.h ============================================================================== --- trunk/libavutil/mem.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/mem.h Wed Jun 30 17:38:06 2010 (r23904) @@ -63,7 +63,7 @@ #endif /** - * Allocates a block of size bytes with alignment suitable for all + * Allocate a block of size bytes with alignment suitable for all * memory accesses (including vectors if available on the CPU). * @param size Size in bytes for the memory block to be allocated. * @return Pointer to the allocated block, NULL if the block cannot @@ -73,9 +73,9 @@ void *av_malloc(unsigned int size) av_malloc_attrib av_alloc_size(1); /** - * Allocates or reallocates a block of memory. - * If ptr is NULL and size > 0, allocates a new block. If - * size is zero, frees the memory block pointed to by ptr. + * Allocate or reallocate a block of memory. + * If ptr is NULL and size > 0, allocate a new block. If + * size is zero, free the memory block pointed to by ptr. * @param size Size in bytes for the memory block to be allocated or * reallocated. * @param ptr Pointer to a memory block already allocated with @@ -87,7 +87,7 @@ void *av_malloc(unsigned int size) av_ma void *av_realloc(void *ptr, unsigned int size) av_alloc_size(2); /** - * Frees a memory block which has been allocated with av_malloc(z)() or + * Free a memory block which has been allocated with av_malloc(z)() or * av_realloc(). * @param ptr Pointer to the memory block which should be freed. * @note ptr = NULL is explicitly allowed. @@ -97,9 +97,9 @@ void *av_realloc(void *ptr, unsigned int void av_free(void *ptr); /** - * Allocates a block of size bytes with alignment suitable for all + * Allocate a block of size bytes with alignment suitable for all * memory accesses (including vectors if available on the CPU) and - * zeroes all the bytes of the block. + * zero all the bytes of the block. * @param size Size in bytes for the memory block to be allocated. * @return Pointer to the allocated block, NULL if it cannot be allocated. * @see av_malloc() @@ -107,7 +107,7 @@ void av_free(void *ptr); void *av_mallocz(unsigned int size) av_malloc_attrib av_alloc_size(1); /** - * Duplicates the string s. + * Duplicate the string s. * @param s string to be duplicated * @return Pointer to a newly allocated string containing a * copy of s or NULL if the string cannot be allocated. @@ -115,7 +115,7 @@ void *av_mallocz(unsigned int size) av_m char *av_strdup(const char *s) av_malloc_attrib; /** - * Frees a memory block which has been allocated with av_malloc(z)() or + * Free a memory block which has been allocated with av_malloc(z)() or * av_realloc() and set the pointer pointing to it to NULL. * @param ptr Pointer to the pointer to the memory block which should * be freed. Modified: trunk/libavutil/pixdesc.h ============================================================================== --- trunk/libavutil/pixdesc.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/pixdesc.h Wed Jun 30 17:38:06 2010 (r23904) @@ -93,7 +93,7 @@ typedef struct AVPixFmtDescriptor{ extern const AVPixFmtDescriptor av_pix_fmt_descriptors[]; /** - * Reads a line from an image, and writes the values of the + * Read a line from an image, and write the values of the * pixel format component c to dst. * * @param data the array containing the pointers to the planes of the image @@ -112,7 +112,7 @@ void read_line(uint16_t *dst, const uint const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component); /** - * Writes the values from src to the pixel format component c of an + * Write the values from src to the pixel format component c of an * image line. * * @param src array containing the values to write @@ -129,7 +129,7 @@ void write_line(const uint16_t *src, uin const AVPixFmtDescriptor *desc, int x, int y, int c, int w); /** - * Returns the pixel format corresponding to name. + * Return the pixel format corresponding to name. * * If there is no pixel format with name name, then looks for a * pixel format with the name corresponding to the native endian @@ -142,7 +142,7 @@ void write_line(const uint16_t *src, uin enum PixelFormat av_get_pix_fmt(const char *name); /** - * Returns the number of bits per pixel used by the pixel format + * Return the number of bits per pixel used by the pixel format * described by pixdesc. * * The returned number of bits refers to the number of bits actually Modified: trunk/libavutil/random_seed.h ============================================================================== --- trunk/libavutil/random_seed.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/random_seed.h Wed Jun 30 17:38:06 2010 (r23904) @@ -24,7 +24,7 @@ #include <stdint.h> /** - * Gets a seed to use in conjunction with random functions. + * Get a seed to use in conjunction with random functions. */ uint32_t av_get_random_seed(void); Modified: trunk/libavutil/rational.h ============================================================================== --- trunk/libavutil/rational.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/rational.h Wed Jun 30 17:38:06 2010 (r23904) @@ -40,7 +40,7 @@ typedef struct AVRational{ } AVRational; /** - * Compares two rationals. + * Compare two rationals. * @param a first rational * @param b second rational * @return 0 if a==b, 1 if a>b and -1 if a<b @@ -53,7 +53,7 @@ static inline int av_cmp_q(AVRational a, } /** - * Converts rational to double. + * Convert rational to double. * @param a rational to convert * @return (double) a */ @@ -62,7 +62,7 @@ static inline double av_q2d(AVRational a } /** - * Reduces a fraction. + * Reduce a fraction. * This is useful for framerate calculations. * @param dst_num destination numerator * @param dst_den destination denominator @@ -74,7 +74,7 @@ static inline double av_q2d(AVRational a int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max); /** - * Multiplies two rationals. + * Multiply two rationals. * @param b first rational * @param c second rational * @return b*c @@ -82,7 +82,7 @@ int av_reduce(int *dst_num, int *dst_den AVRational av_mul_q(AVRational b, AVRational c) av_const; /** - * Divides one rational by another. + * Divide one rational by another. * @param b first rational * @param c second rational * @return b/c @@ -90,7 +90,7 @@ AVRational av_mul_q(AVRational b, AVRati AVRational av_div_q(AVRational b, AVRational c) av_const; /** - * Adds two rationals. + * Add two rationals. * @param b first rational * @param c second rational * @return b+c @@ -98,7 +98,7 @@ AVRational av_div_q(AVRational b, AVRati AVRational av_add_q(AVRational b, AVRational c) av_const; /** - * Subtracts one rational from another. + * Subtract one rational from another. * @param b first rational * @param c second rational * @return b-c @@ -106,7 +106,7 @@ AVRational av_add_q(AVRational b, AVRati AVRational av_sub_q(AVRational b, AVRational c) av_const; /** - * Converts a double precision floating point number to a rational. + * Convert a double precision floating point number to a rational. * @param d double to convert * @param max the maximum allowed numerator and denominator * @return (AVRational) d @@ -120,7 +120,7 @@ AVRational av_d2q(double d, int max) av_ int av_nearer_q(AVRational q, AVRational q1, AVRational q2); /** - * Finds the nearest value in q_list to q. + * Find the nearest value in q_list to q. * @param q_list an array of rationals terminated by {0, 0} * @return the index of the nearest value found in the array */ Modified: trunk/libavutil/sha.h ============================================================================== --- trunk/libavutil/sha.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/sha.h Wed Jun 30 17:38:06 2010 (r23904) @@ -28,7 +28,7 @@ extern const int av_sha_size; struct AVSHA; /** - * Initializes SHA-1 or SHA-2 hashing. + * Initialize SHA-1 or SHA-2 hashing. * * @param context pointer to the function context (of size av_sha_size) * @param bits number of bits in digest (SHA-1 - 160 bits, SHA-2 224 or 256 bits) @@ -37,7 +37,7 @@ struct AVSHA; int av_sha_init(struct AVSHA* context, int bits); /** - * Updates hash value. + * Update hash value. * * @param context hash function context * @param data input data to update hash with @@ -46,7 +46,7 @@ int av_sha_init(struct AVSHA* context, i void av_sha_update(struct AVSHA* context, const uint8_t* data, unsigned int len); /** - * Finishes hashing and output digest value. + * Finish hashing and output digest value. * * @param context hash function context * @param digest buffer where output digest value is stored Modified: trunk/libavutil/sha1.h ============================================================================== --- trunk/libavutil/sha1.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/sha1.h Wed Jun 30 17:38:06 2010 (r23904) @@ -28,7 +28,7 @@ extern const int av_sha1_size; struct AVSHA1; /** - * Initializes SHA-1 hashing. + * Initialize SHA-1 hashing. * * @param context pointer to the function context (of size av_sha_size) * @deprecated use av_sha_init() instead @@ -36,7 +36,7 @@ struct AVSHA1; void av_sha1_init(struct AVSHA1* context); /** - * Updates hash value. + * Update hash value. * * @param context hash function context * @param data input data to update hash with @@ -46,7 +46,7 @@ void av_sha1_init(struct AVSHA1* context void av_sha1_update(struct AVSHA1* context, const uint8_t* data, unsigned int len); /** - * Finishes hashing and output digest value. + * Finish hashing and output digest value. * * @param context hash function context * @param digest buffer where output digest value is stored Modified: trunk/libavutil/tree.h ============================================================================== --- trunk/libavutil/tree.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libavutil/tree.h Wed Jun 30 17:38:06 2010 (r23904) @@ -33,7 +33,7 @@ struct AVTreeNode; extern const int av_tree_node_size; /** - * Finds an element. + * Find an element. * @param root a pointer to the root node of the tree * @param next If next is not NULL, then next[0] will contain the previous * element and next[1] the next element. If either does not exist, @@ -44,7 +44,7 @@ extern const int av_tree_node_size; void *av_tree_find(const struct AVTreeNode *root, void *key, int (*cmp)(void *key, const void *b), void *next[2]); /** - * Inserts or removes an element. + * Insert or remove an element. * If *next is NULL, then the supplied element will be removed if it exists. * If *next is not NULL, then the supplied element will be inserted, unless * it already exists in the tree. @@ -80,7 +80,7 @@ void *av_tree_insert(struct AVTreeNode * void av_tree_destroy(struct AVTreeNode *t); /** - * Applies enu(opaque, &elem) to all the elements in the tree in a given range. + * Apply enu(opaque, &elem) to all the elements in the tree in a given range. * * @param cmp a comparison function that returns < 0 for a element below the * range, > 0 for a element above the range and == 0 for a Modified: trunk/libpostproc/postprocess.h ============================================================================== --- trunk/libpostproc/postprocess.h Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libpostproc/postprocess.h Wed Jun 30 17:38:06 2010 (r23904) @@ -44,17 +44,17 @@ #define LIBPOSTPROC_IDENT "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION) /** - * Returns the LIBPOSTPROC_VERSION_INT constant. + * Return the LIBPOSTPROC_VERSION_INT constant. */ unsigned postproc_version(void); /** - * Returns the libpostproc build-time configuration. + * Return the libpostproc build-time configuration. */ const char *postproc_configuration(void); /** - * Returns the libpostproc license. + * Return the libpostproc license. */ const char *postproc_license(void); Modified: trunk/libpostproc/postprocess_template.c ============================================================================== --- trunk/libpostproc/postprocess_template.c Wed Jun 30 12:38:04 2010 (r23903) +++ trunk/libpostproc/postprocess_template.c Wed Jun 30 17:38:06 2010 (r23904) @@ -1390,7 +1390,7 @@ DERING_CORE((%0, %1, 8) ,(%%REGd, %1, #endif //HAVE_ALTIVEC /** - * Deinterlaces the given block by linearly interpolating every second line. + * Deinterlace the given block by linearly interpolating every second line. * will be called for every 8x8 block and can read & write from line 4-15 * lines 0-3 have been passed through the deblock / dering filters already, but can be read, too. * lines 4-12 will be read into the deblocking filter and should be deinterlaced @@ -1442,7 +1442,7 @@ static inline void RENAME(deInterlaceInt } /** - * Deinterlaces the given block by cubic interpolating every second line. + * Deinterlace the given block by cubic interpolating every second line. * will be called for every 8x8 block and can read & write from line 4-15 * lines 0-3 have been passed through the deblock / dering filters already, but can be read, too. * lines 4-12 will be read into the deblocking filter and should be deinterlaced @@ -1506,7 +1506,7 @@ DEINT_CUBIC((%%REGd, %1), (%0, %1, 8) , } /** - * Deinterlaces the given block by filtering every second line with a (-1 4 2 4 -1) filter. + * Deinterlace the given block by filtering every second line with a (-1 4 2 4 -1) filter. * will be called for every 8x8 block and can read & write from line 4-15 * lines 0-3 have been passed through the deblock / dering filters already, but can be read, too. * lines 4-12 will be read into the deblocking filter and should be deinterlaced @@ -1585,7 +1585,7 @@ DEINT_FF((%%REGd, %1), (%%REGd, %1, 2), } /** - * Deinterlaces the given block by filtering every line with a (-1 2 6 2 -1) filter. + * Deinterlace the given block by filtering every line with a (-1 2 6 2 -1) filter. * will be called for every 8x8 block and can read & write from line 4-15 * lines 0-3 have been passed through the deblock / dering filters already, but can be read, too. * lines 4-12 will be read into the deblocking filter and should be deinterlaced @@ -1686,7 +1686,7 @@ DEINT_L5(%%mm1, %%mm0, (%%REGd, %1, 2), } /** - * Deinterlaces the given block by filtering all lines with a (1 2 1) filter. + * Deinterlace the given block by filtering all lines with a (1 2 1) filter. * will be called for every 8x8 block and can read & write from line 4-15 * lines 0-3 have been passed through the deblock / dering filters already, but can be read, too. * lines 4-12 will be read into the deblocking filter and should be deinterlaced @@ -1788,7 +1788,7 @@ static inline void RENAME(deInterlaceBle } /** - * Deinterlaces the given block by applying a median filter to every second line. + * Deinterlace the given block by applying a median filter to every second line. * will be called for every 8x8 block and can read & write from line 4-15, * lines 0-3 have been passed through the deblock / dering filters already, but can be read, too. * lines 4-12 will be read into the deblocking filter and should be deinterlaced @@ -3006,7 +3006,7 @@ static void RENAME(postProcess)(const ui const QP_STORE_T QPs[], int QPStride, int isColor, PPContext *c); /** - * Copies a block from src to dst and fixes the blacklevel. + * Copy a block from src to dst and fixes the blacklevel. * levelFix == 0 -> do not touch the brighness & contrast */ #undef REAL_SCALED_CPY @@ -3138,7 +3138,7 @@ SIMPLE_CPY((%%REGa, %2), (%%REGa, %2, 2) } /** - * Duplicates the given 8 src pixels ? times upward + * Duplicate the given 8 src pixels ? times upward */ static inline void RENAME(duplicate)(uint8_t src[], int stride) { @@ -3163,7 +3163,7 @@ static inline void RENAME(duplicate)(uin } /** - * Filters array of bytes (Y or U or V values) + * Filter array of bytes (Y or U or V values) */ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, const QP_STORE_T QPs[], int QPStride, int isColor, PPContext *c2)

12 31

r20411 - trunk/libavcodec/vorbis_dec.c
by subversion＠mplayerhq.hu 02 Jul '10

02 Jul '10

Author: reimar Date: Wed Oct 28 23:41:45 2009 New Revision: 20411 Log: vorbis_dec: factor out duplicated code for index reading, bounds checking and error message into a shared macro. Modified: trunk/libavcodec/vorbis_dec.c Modified: trunk/libavcodec/vorbis_dec.c ============================================================================== --- trunk/libavcodec/vorbis_dec.c Wed Oct 28 21:46:21 2009 (r20410) +++ trunk/libavcodec/vorbis_dec.c Wed Oct 28 23:41:45 2009 (r20411) @@ -160,6 +160,20 @@ typedef struct vorbis_context_s { #define BARK(x) \ (13.1f * atan(0.00074f * (x)) + 2.24f * atan(1.85e-8f * (x) * (x)) + 1e-4f * (x)) +static const char idx_err_str[] = "Index value %d out of range (0 - %d) for %s at %s:%i\n"; +#define VALIDATE_INDEX(idx, limit) \ + if (idx >= limit) {\ + av_log(vc->avccontext, AV_LOG_ERROR,\ + idx_err_str,\ + (int)(idx), (int)(limit - 1), #idx, __FILE__, __LINE__);\ + return -1;\ + } +#define GET_VALIDATED_INDEX(idx, bits, limit) \ + {\ + idx = get_bits(gb, bits);\ + VALIDATE_INDEX(idx, limit)\ + } + static float vorbisfloat2float(uint_fast32_t val) { double mant = val & 0x1fffff; @@ -490,22 +504,15 @@ static int vorbis_parse_setup_hdr_floors AV_DEBUG(" %d floor %d class dim: %d subclasses %d \n", i, j, floor_setup->data.t1.class_dimensions[j], floor_setup->data.t1.class_subclasses[j]); if (floor_setup->data.t1.class_subclasses[j]) { - int bits = get_bits(gb, 8); - if (bits >= vc->codebook_count) { - av_log(vc->avccontext, AV_LOG_ERROR, "Masterbook index %d is out of range.\n", bits); - return -1; - } - floor_setup->data.t1.class_masterbook[j] = bits; + GET_VALIDATED_INDEX(floor_setup->data.t1.class_masterbook[j], 8, vc->codebook_count) AV_DEBUG(" masterbook: %d \n", floor_setup->data.t1.class_masterbook[j]); } for (k = 0; k < (1 << floor_setup->data.t1.class_subclasses[j]); ++k) { int16_t bits = get_bits(gb, 8) - 1; - if (bits != -1 && bits >= vc->codebook_count) { - av_log(vc->avccontext, AV_LOG_ERROR, "Subclass book index %d is out of range.\n", bits); - return -1; - } + if (bits != -1) + VALIDATE_INDEX(bits, vc->codebook_count) floor_setup->data.t1.subclass_books[j][k] = bits; AV_DEBUG(" book %d. : %d \n", k, floor_setup->data.t1.subclass_books[j][k]); @@ -564,10 +571,7 @@ static int vorbis_parse_setup_hdr_floors int idx; uint_fast8_t book_idx; for (idx = 0; idx < floor_setup->data.t0.num_books; ++idx) { - book_idx = get_bits(gb, 8); - if (book_idx >= vc->codebook_count) - return -1; - floor_setup->data.t0.book_list[idx] = book_idx; + GET_VALIDATED_INDEX(floor_setup->data.t0.book_list[idx], 8, vc->codebook_count) if (vc->codebooks[book_idx].dimensions > max_codebook_dim) max_codebook_dim = vc->codebooks[book_idx].dimensions; } @@ -650,11 +654,7 @@ static int vorbis_parse_setup_hdr_residu } res_setup->classifications = get_bits(gb, 6) + 1; - res_setup->classbook = get_bits(gb, 8); - if (res_setup->classbook >= vc->codebook_count) { - av_log(vc->avccontext, AV_LOG_ERROR, "classbook value %d out of range. \n", res_setup->classbook); - return -1; - } + GET_VALIDATED_INDEX(res_setup->classbook, 8, vc->codebook_count) AV_DEBUG(" begin %d end %d part.size %d classif.s %d classbook %d \n", res_setup->begin, res_setup->end, res_setup->partition_size, res_setup->classifications, res_setup->classbook); @@ -673,12 +673,7 @@ static int vorbis_parse_setup_hdr_residu for (j = 0; j < res_setup->classifications; ++j) { for (k = 0; k < 8; ++k) { if (cascade[j]&(1 << k)) { - int bits = get_bits(gb, 8); - if (bits >= vc->codebook_count) { - av_log(vc->avccontext, AV_LOG_ERROR, "book value %d out of range. \n", bits); - return -1; - } - res_setup->books[j][k] = bits; + GET_VALIDATED_INDEX(res_setup->books[j][k], 8, vc->codebook_count) AV_DEBUG(" %d class casscade depth %d book: %d \n", j, k, res_setup->books[j][k]); @@ -723,16 +718,8 @@ static int vorbis_parse_setup_hdr_mappin mapping_setup->magnitude = av_mallocz(mapping_setup->coupling_steps * sizeof(uint_fast8_t)); mapping_setup->angle = av_mallocz(mapping_setup->coupling_steps * sizeof(uint_fast8_t)); for (j = 0; j < mapping_setup->coupling_steps; ++j) { - mapping_setup->magnitude[j] = get_bits(gb, ilog(vc->audio_channels - 1)); - mapping_setup->angle[j] = get_bits(gb, ilog(vc->audio_channels - 1)); - if (mapping_setup->magnitude[j] >= vc->audio_channels) { - av_log(vc->avccontext, AV_LOG_ERROR, "magnitude channel %d out of range. \n", mapping_setup->magnitude[j]); - return -1; - } - if (mapping_setup->angle[j] >= vc->audio_channels) { - av_log(vc->avccontext, AV_LOG_ERROR, "angle channel %d out of range. \n", mapping_setup->angle[j]); - return -1; - } + GET_VALIDATED_INDEX(mapping_setup->magnitude[j], ilog(vc->audio_channels - 1), vc->audio_channels) + GET_VALIDATED_INDEX(mapping_setup->angle[j], ilog(vc->audio_channels - 1), vc->audio_channels) } } else { mapping_setup->coupling_steps = 0; @@ -752,20 +739,9 @@ static int vorbis_parse_setup_hdr_mappin } for (j = 0; j < mapping_setup->submaps; ++j) { - int bits; skip_bits(gb, 8); // FIXME check? - bits = get_bits(gb, 8); - if (bits >= vc->floor_count) { - av_log(vc->avccontext, AV_LOG_ERROR, "submap floor value %d out of range. \n", bits); - return -1; - } - mapping_setup->submap_floor[j] = bits; - bits = get_bits(gb, 8); - if (bits >= vc->residue_count) { - av_log(vc->avccontext, AV_LOG_ERROR, "submap residue value %d out of range. \n", bits); - return -1; - } - mapping_setup->submap_residue[j] = bits; + GET_VALIDATED_INDEX(mapping_setup->submap_floor[j], 8, vc->floor_count) + GET_VALIDATED_INDEX(mapping_setup->submap_residue[j], 8, vc->residue_count) AV_DEBUG(" %d mapping %d submap : floor %d, residue %d \n", i, j, mapping_setup->submap_floor[j], mapping_setup->submap_residue[j]); } @@ -827,11 +803,7 @@ static int vorbis_parse_setup_hdr_modes( mode_setup->blockflag = get_bits1(gb); mode_setup->windowtype = get_bits(gb, 16); //FIXME check mode_setup->transformtype = get_bits(gb, 16); //FIXME check - mode_setup->mapping = get_bits(gb, 8); - if (mode_setup->mapping >= vc->mapping_count) { - av_log(vc->avccontext, AV_LOG_ERROR, "mode mapping value %d out of range. \n", mode_setup->mapping); - return -1; - } + GET_VALIDATED_INDEX(mode_setup->mapping, 8, vc->mapping_count); AV_DEBUG(" %d mode: blockflag %d, windowtype %d, transformtype %d, mapping %d \n", i, mode_setup->blockflag, mode_setup->windowtype, mode_setup->transformtype, mode_setup->mapping); } @@ -1498,11 +1470,7 @@ static int vorbis_parse_audio_packet(vor if (vc->mode_count == 1) { mode_number = 0; } else { - mode_number = get_bits(gb, ilog(vc->mode_count-1)); - } - if (mode_number >= vc->mode_count) { - av_log(vc->avccontext, AV_LOG_ERROR, "mode number %d out of range.\n", mode_number); - return -1; + GET_VALIDATED_INDEX(mode_number, ilog(vc->mode_count-1), vc->mode_count) } vc->mode_number = mode_number; mapping = &vc->mappings[vc->modes[mode_number].mapping];

3 3

r23460 - trunk/libavcodec/vorbis_enc.c
by subversion＠mplayerhq.hu 01 Jul '10

01 Jul '10

Author: cehoyos Date: Fri Jun 4 01:53:10 2010 New Revision: 23460 Log: Raise default vorbis encoding quality. Patch by Frank Barchard, fbarchard google com Modified: trunk/libavcodec/vorbis_enc.c Modified: trunk/libavcodec/vorbis_enc.c ============================================================================== --- trunk/libavcodec/vorbis_enc.c Fri Jun 4 00:20:07 2010 (r23459) +++ trunk/libavcodec/vorbis_enc.c Fri Jun 4 01:53:10 2010 (r23460) @@ -955,7 +955,7 @@ static av_cold int vorbis_encode_init(AV if (avccontext->flags & CODEC_FLAG_QSCALE) venc->quality = avccontext->global_quality / (float)FF_QP2LAMBDA / 10.; else - venc->quality = 1.; + venc->quality = 0.03; venc->quality *= venc->quality; avccontext->extradata_size = put_main_header(venc, (uint8_t**)&avccontext->extradata);

2 1

r23911 - trunk/libavutil/internal.h
by subversion＠mplayerhq.hu 01 Jul '10

01 Jul '10

Author: mru Date: Wed Jun 30 22:09:55 2010 New Revision: 23911 Log: Improve FF_SYMVER documentation Modified: trunk/libavutil/internal.h Modified: trunk/libavutil/internal.h ============================================================================== --- trunk/libavutil/internal.h Wed Jun 30 22:09:52 2010 (r23910) +++ trunk/libavutil/internal.h Wed Jun 30 22:09:55 2010 (r23911) @@ -204,12 +204,21 @@ /** - * Create a non default alias for a function with specified version. - * This is needed when symbols are moved from a lib to a dependancy of the lib - * because the gnu linker as of 2010 is buggy and fails to dynamicaly link if a symbol - * is not found in the lib in which it was during link time with enabled versioning - * even if a correctly versioned and matching symbol exists in another lib and - * even if it did find that would it not contain an explicit check to fail + * Define a function with only the non-default version specified. + * + * On systems with ELF shared libraries, all symbols exported from + * FFmpeg libraries are tagged with the name and major version of the + * library to which they belong. If a function is moved from one + * library to another, a wrapper must be retained in the original + * location to preserve binary compatibility. + * + * Functions defined with this macro will never be used to resolve + * symbols by the build-time linker. + * + * @param type return type of function + * @param name name of function + * @param args argument list of function + * @param ver version tag to assign function */ #if HAVE_SYMVER_ASM_LABEL # define FF_SYMVER(type, name, args, ver) \

6 12

r23915 - in trunk/libavcodec: Makefile vp56.h
by subversion＠mplayerhq.hu 01 Jul '10

01 Jul '10

Author: stefang Date: Thu Jul 1 00:05:29 2010 New Revision: 23915 Log: renormalize VP5/6/7/8 range coder without loop Modified: trunk/libavcodec/Makefile trunk/libavcodec/vp56.h Modified: trunk/libavcodec/Makefile ============================================================================== --- trunk/libavcodec/Makefile Wed Jun 30 23:46:03 2010 (r23914) +++ trunk/libavcodec/Makefile Thu Jul 1 00:05:29 2010 (r23915) @@ -376,7 +376,7 @@ OBJS-$(CONFIG_VP5_DECODER) + OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o vp56dsp.o \ vp3dsp.o vp6dsp.o huffman.o OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp8dsp.o vp56.o vp56data.o \ - h264pred.o + h264pred.o cabac.o OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o OBJS-$(CONFIG_WMAPRO_DECODER) += wmaprodec.o wma.o Modified: trunk/libavcodec/vp56.h ============================================================================== --- trunk/libavcodec/vp56.h Wed Jun 30 23:46:03 2010 (r23914) +++ trunk/libavcodec/vp56.h Thu Jul 1 00:05:29 2010 (r23915) @@ -28,6 +28,7 @@ #include "dsputil.h" #include "get_bits.h" #include "bytestream.h" +#include "cabac.h" #include "vp56dsp.h" typedef struct vp56_context VP56Context; @@ -195,6 +196,7 @@ static inline int vp56_rac_get_prob(VP56 unsigned int low = 1 + (((c->high - 1) * prob) >> 8); unsigned int low_shift = low << 8; int bit = c->code_word >= low_shift; + int shift; if (bit) { c->high -= low; @@ -204,13 +206,13 @@ static inline int vp56_rac_get_prob(VP56 } /* normalize */ - while (c->high < 128) { - c->high <<= 1; - c->code_word <<= 1; - if (--c->bits == 0 && c->buffer < c->end) { - c->bits = 8; - c->code_word |= *c->buffer++; - } + shift = ff_h264_norm_shift[c->high] - 1; + c->high <<= shift; + c->code_word <<= shift; + c->bits -= shift; + if(c->bits <= 0 && c->buffer < c->end) { + c->code_word |= *c->buffer++ << -c->bits; + c->bits += 8; } return bit; }

2 1

r23921 - trunk/libavcodec/vp56.h
by subversion＠mplayerhq.hu 01 Jul '10

01 Jul '10

Author: darkshikari Date: Thu Jul 1 01:18:47 2010 New Revision: 23921 Log: CMOV-ify vp56 arithcoder This incantation causes gcc 4.3 to generate cmov on x86, a vastly better option than a completely unpredictable branch. Hopefully this carries over to newer versions and other CPUs with conditionals. ~5 cycles saved per call on a Core i7. Modified: trunk/libavcodec/vp56.h Modified: trunk/libavcodec/vp56.h ============================================================================== --- trunk/libavcodec/vp56.h Thu Jul 1 01:15:25 2010 (r23920) +++ trunk/libavcodec/vp56.h Thu Jul 1 01:18:47 2010 (r23921) @@ -199,12 +199,8 @@ static inline int vp56_rac_get_prob(VP56 int bit = c->code_word >= low_shift; int shift; - if (bit) { - c->high -= low; - c->code_word -= low_shift; - } else { - c->high = low; - } + c->high = bit ? c->high - low : low; + c->code_word = bit ? c->code_word - low_shift : c->code_word; /* normalize */ shift = ff_h264_norm_shift[c->high] - 1;

4 3