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)
* 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>

No differences found