Merge commit 'ee62b364be0c30cba83b5ff10a3ca8c3e866ade6'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 11:01:15 +0000 (13:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 11:23:45 +0000 (13:23 +0200)
commitab7ad5e6a1b8359b169e7bcbe96ce7162d0c0002
tree884b721a07e241495ab86a2317d929a8b71dbee8
parent580c86925ddf8c85d2e6f57ed55dd75853748b29
parentee62b364be0c30cba83b5ff10a3ca8c3e866ade6
Merge commit 'ee62b364be0c30cba83b5ff10a3ca8c3e866ade6'

* commit 'ee62b364be0c30cba83b5ff10a3ca8c3e866ade6':
  h264: eliminate ff_h264_set_parameter_from_sps()

Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c

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