Merge commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:18:21 +0000 (23:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:18:51 +0000 (23:18 +0100)
commit4cbf3eb9e6a88426da255a00305b5858070d192a
tree321d2b32dcc9092a9d46e508b91ae8094b95c208
parentdee6d5f51c72be11aae95caf02551fb94e02d6e7
parenteb891b3114f499e96b9faddd0b0ae856345dfbd9
Merge commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9'

* commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9':
  Replace all uses of avcodec_free_frame with av_frame_free().

Conflicts:
doc/examples/decoding_encoding.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
libavformat/utils.c