Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Dec 2012 14:00:28 +0000 (15:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Dec 2012 14:17:51 +0000 (15:17 +0100)
commitb9d887c225466576ae80ef7f2b109e866ff137b2
tree61ffb780b58021fe4186fb2caad3a8fdcb09bc5f
parentb6e7041f90daf89b17a10bcd73cd3b42d4e3540a
parent072be3e8969f24113d599444be4d6a0ed04a6602
Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'

* commit '072be3e8969f24113d599444be4d6a0ed04a6602':
  h264: set parameters from SPS whenever it changes
  asyncts: cosmetics: reindent

Conflicts:
libavcodec/h264.c

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