* commit '7751e4693dd10ec98c20fbd9887233b575034272': ogg: check that the expected number of headers had been parsed libx264: change default to closed gop to match x264cli Use avcodec_free_frame() to free AVFrames. lavf: use a malloced AVFrame in try_decode_frame(). lavc: add avcodec_free_frame(). lavc: ensure extended_data is set properly on decoding lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults() lavc: use av_mallocz to allocate AVFrames. lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults Conflicts: doc/APIchanges doc/examples/decoding_encoding.c libavcodec/utils.c libavcodec/version.h libavfilter/src_movie.c libavformat/oggdec.c libavformat/oggdec.h libavformat/oggparsetheora.c libavformat/utils.c
Showing the changes to doc/examples/decoding_encoding.c (1 of 21 files). Show all
Unified · Split
| @@ -222,7 +222,7 @@ static void audio_encode_example(const char *filename) · 221 unmodified lines | ||
| 222 | 222 | fclose(f); |
| 223 | 223 | |
| 224 | 224 | av_freep(&samples); |
| 225 | − av_freep(&frame); | |
| 225 | + avcodec_free_frame(&frame); | |
| 226 | 226 | avcodec_close(c); |
| 227 | 227 | av_free(c); |
| 228 | 228 | } |
| @@ -320,7 +320,7 @@ static void audio_decode_example(const char *outfilename, const char *filename) · 91 unmodified lines | ||
| 320 | 320 | |
| 321 | 321 | avcodec_close(c); |
| 322 | 322 | av_free(c); |
| 323 | − av_free(decoded_frame); | |
| 323 | + avcodec_free_frame(&decoded_frame); | |
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | /* |
| @@ -454,7 +454,7 @@ static void video_encode_example(const char *filename, int codec_id) · 127 unmodified lines | ||
| 454 | 454 | avcodec_close(c); |
| 455 | 455 | av_free(c); |
| 456 | 456 | av_freep(&frame->data[0]); |
| 457 | − av_free(frame); | |
| 457 | + avcodec_free_frame(&frame); | |
| 458 | 458 | printf("\n"); |
| 459 | 459 | } |
| 460 | 460 | |
| @@ -594,7 +594,7 @@ static void video_decode_example(const char *outfilename, const char *filename) · 133 unmodified lines | ||
| 594 | 594 | |
| 595 | 595 | avcodec_close(c); |
| 596 | 596 | av_free(c); |
| 597 | − av_free(picture); | |
| 597 | + avcodec_free_frame(&picture); | |
| 598 | 598 | printf("\n"); |
| 599 | 599 | } |
| 600 | 600 | |