diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-16 23:48:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-16 23:54:10 +0100 |
| commit | 0ee905e243078cd4dfb3afa32777129aeee3bddb (patch) | |
| tree | 78bafb0b5626836d18d158139b71d0e6b73780a2 /doc/examples/muxing.c | |
| parent | 571a99de186eac69ed0d6b0eaaaa983cae30765a (diff) | |
| parent | 5b9c3b4505206143d85398c1410949319fa1180f (diff) | |
| download | ffmpeg-0ee905e243078cd4dfb3afa32777129aeee3bddb.tar.gz | |
Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'
* commit '5b9c3b4505206143d85398c1410949319fa1180f':
Replace all instances of avcodec_alloc_frame() with av_frame_alloc().
Conflicts:
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
libavcodec/alacenc.c
libavcodec/libopenjpegenc.c
libavcodec/libvpxenc.c
libavcodec/pcm.c
libavcodec/xbmenc.c
libavcodec/xwdenc.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/muxing.c')
| -rw-r--r-- | doc/examples/muxing.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c index a8f979f4be..4276114306 100644 --- a/doc/examples/muxing.c +++ b/doc/examples/muxing.c @@ -221,7 +221,7 @@ static void write_audio_frame(AVFormatContext *oc, AVStream *st) { AVCodecContext *c; AVPacket pkt = { 0 }; // data and size must be 0; - AVFrame *frame = avcodec_alloc_frame(); + AVFrame *frame = av_frame_alloc(); int got_packet, ret, dst_nb_samples; av_init_packet(&pkt); @@ -310,7 +310,7 @@ static void open_video(AVFormatContext *oc, AVCodec *codec, AVStream *st) } /* allocate and init a re-usable frame */ - frame = avcodec_alloc_frame(); + frame = av_frame_alloc(); if (!frame) { fprintf(stderr, "Could not allocate video frame\n"); exit(1); |