Merge commit '598ce4ab4f1893e0661fc038101487e511937877'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 23:25:31 +0000 (00:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 23:25:31 +0000 (00:25 +0100)
commite3578fd525e94bfec16de1dfd0e5a49f18a0e0fd
tree64be727821a3d423a5d5233a2b1905c7add49efb
parent525a7d9b78683ce0e44a97283eb7ed23d36ae688
parent598ce4ab4f1893e0661fc038101487e511937877
Merge commit '598ce4ab4f1893e0661fc038101487e511937877'

* commit '598ce4ab4f1893e0661fc038101487e511937877':
  h264: call av_frame_unref() instead of avcodec_get_frame_defaults().

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c