History

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

Michael Niedermayer committed 13 years ago

Commit 0ee905e2 parents 571a99d 5b9c3b427 files · +33 −33Browse files

Showing the changes to libavfilter/libmpcodecs (1 of 27 files). Show all

Unified · Split

libavfilter/libmpcodecs/vf_uspp.c+2−2
@@ -245,8 +245,8 @@ static int config(struct vf_instance *vf, · 244 unmodified lines
245 av_dict_free(&opts);245 av_dict_free(&opts);
246 assert(avctx_enc->codec);246 assert(avctx_enc->codec);
247 }247 }
248 vf->priv->frame= avcodec_alloc_frame();248 vf->priv->frame= av_frame_alloc();
249 vf->priv->frame_dec= avcodec_alloc_frame();249 vf->priv->frame_dec= av_frame_alloc();
250 250
251 vf->priv->outbuf_size= (width + BLOCK)*(height + BLOCK)*10;251 vf->priv->outbuf_size= (width + BLOCK)*(height + BLOCK)*10;
252 vf->priv->outbuf= malloc(vf->priv->outbuf_size);252 vf->priv->outbuf= malloc(vf->priv->outbuf_size);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t