Merge commit '6f4404b24bcf59ab29cd4b57995d374a578f51a7' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Jun 2014 00:45:10 +0000 (02:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Jun 2014 00:45:10 +0000 (02:45 +0200)
commit952738d0af74041c9ad8ac17f6d848a6d69fb3f1
tree724022064017b561853e030dee3d3cf1f5aaea86
parentd499685d8020b919f0953fd358f2e8dc9a206783
parent6f4404b24bcf59ab29cd4b57995d374a578f51a7
Merge commit '6f4404b24bcf59ab29cd4b57995d374a578f51a7' into release/0.10

* commit '6f4404b24bcf59ab29cd4b57995d374a578f51a7':
  h264: set parameters from SPS whenever it changes
  alac: Limit max_samples_per_frame

Conflicts:
libavcodec/h264.c

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