Merge commit '3a0576702825423abecb32627c530dbc4c0f73bc'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 12:58:02 +0000 (13:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 12:58:02 +0000 (13:58 +0100)
commit99b12357f47efd7da070e29d888e9e7646824667
tree65d7d46c6a976a0d3dabb31f34c2efdfb064151b
parent60b46a00c62db3e366322f99d261480cd213bfa5
parent3a0576702825423abecb32627c530dbc4c0f73bc
Merge commit '3a0576702825423abecb32627c530dbc4c0f73bc'

* commit '3a0576702825423abecb32627c530dbc4c0f73bc':
  h264: store current_sps_id inside the current sps

Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c

The current_sps_id is not removed as it used in security related code.

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