* commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c
Showing the changes to doc/examples/decoding_encoding.c (1 of 334 files). Show all
Unified · Split
| @@ -561,7 +561,7 @@ static void video_decode_example(const char *outfilename, const char *filename) · 560 unmodified lines | |||
| 561 | exit(1); | 561 | exit(1); |
| 562 | } | 562 | } |
| 563 | 563 | ||
| 564 | if(codec->capabilities&CODEC_CAP_TRUNCATED) | 564 | if (codec->capabilities & AV_CODEC_CAP_TRUNCATED) |
| 565 | c->flags |= AV_CODEC_FLAG_TRUNCATED; // we do not send complete frames | 565 | c->flags |= AV_CODEC_FLAG_TRUNCATED; // we do not send complete frames |
| 566 | 566 | ||
| 567 | /* For some codecs, such as msmpeg4 and mpeg4, width and height | 567 | /* For some codecs, such as msmpeg4 and mpeg4, width and height |