Merge commit '7f045c4429e91688f1f2335dd347203431901c06'
authorClément Bœsch <clement@stupeflix.com>
Mon, 20 Jun 2016 10:00:29 +0000 (12:00 +0200)
committerClément Bœsch <clement@stupeflix.com>
Mon, 20 Jun 2016 10:03:21 +0000 (12:03 +0200)
commitc957909a9f48196bfb4cb295c750ec6d495d7bbb
tree527a562837b64e20ef52df4dfdd0af4b9261fb94
parentd98ca4b14c673db8eb3cc124e42ff7a660da9109
parent7f045c4429e91688f1f2335dd347203431901c06
Merge commit '7f045c4429e91688f1f2335dd347203431901c06'

* commit '7f045c4429e91688f1f2335dd347203431901c06':
  h264: merge ff_h264_free_context() into h264_decode_end()

Merged-by: Clément Bœsch <clement@stupeflix.com>
libavcodec/h264.c
libavcodec/h264.h