* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c
Showing the changes to doc/examples/decoding_encoding.c (1 of 153 files). Show all
Unified · Split
| @@ -245,7 +245,7 @@ static void audio_decode_example(const char *outfilename, const char *filename) · 244 unmodified lines | |||
| 245 | AVCodecContext *c= NULL; | 245 | AVCodecContext *c= NULL; |
| 246 | int len; | 246 | int len; |
| 247 | FILE *f, *outfile; | 247 | FILE *f, *outfile; |
| 248 | uint8_t inbuf[AUDIO_INBUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE]; | 248 | uint8_t inbuf[AUDIO_INBUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; |
| 249 | AVPacket avpkt; | 249 | AVPacket avpkt; |
| 250 | AVFrame *decoded_frame = NULL; | 250 | AVFrame *decoded_frame = NULL; |
| 251 | 251 | ||
| @@ -538,13 +538,13 @@ static void video_decode_example(const char *outfilename, const char *filename) · 286 unmodified lines | |||
| 538 | int frame_count; | 538 | int frame_count; |
| 539 | FILE *f; | 539 | FILE *f; |
| 540 | AVFrame *frame; | 540 | AVFrame *frame; |
| 541 | uint8_t inbuf[INBUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE]; | 541 | uint8_t inbuf[INBUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; |
| 542 | AVPacket avpkt; | 542 | AVPacket avpkt; |
| 543 | 543 | ||
| 544 | av_init_packet(&avpkt); | 544 | av_init_packet(&avpkt); |
| 545 | 545 | ||
| 546 | /* set end of buffer to 0 (this ensures that no overreading happens for damaged mpeg streams) */ | 546 | /* set end of buffer to 0 (this ensures that no overreading happens for damaged mpeg streams) */ |
| 547 | memset(inbuf + INBUF_SIZE, 0, FF_INPUT_BUFFER_PADDING_SIZE); | 547 | memset(inbuf + INBUF_SIZE, 0, AV_INPUT_BUFFER_PADDING_SIZE); |
| 548 | 548 | ||
| 549 | printf("Decode video file %s to %s\n", filename, outfilename); | 549 | printf("Decode video file %s to %s\n", filename, outfilename); |
| 550 | 550 | ||