aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/wmadec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-16 23:48:16 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-16 23:54:10 +0100
commit0ee905e243078cd4dfb3afa32777129aeee3bddb (patch)
tree78bafb0b5626836d18d158139b71d0e6b73780a2 /libavcodec/wmadec.c
parent571a99de186eac69ed0d6b0eaaaa983cae30765a (diff)
parent5b9c3b4505206143d85398c1410949319fa1180f (diff)
downloadffmpeg-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 'libavcodec/wmadec.c')
0 files changed, 0 insertions, 0 deletions