1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavcodec
Michael Niedermayer b9d887c225 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>
2012-12-14 15:17:51 +01:00
..
2012-12-12 01:22:09 +01:00
2012-12-07 16:15:02 -05:00
2012-12-06 19:09:48 +00:00
2012-12-14 01:13:21 +01:00
2012-12-08 01:13:07 +00:00
2012-12-11 20:17:30 +11:00
2012-12-05 19:31:27 +01:00
2012-12-08 01:13:07 +00:00
2012-12-08 01:13:07 +00:00
2012-12-11 11:46:22 +00:00
2012-12-12 17:46:05 +01:00
2012-12-14 00:31:18 +01:00
2012-12-09 22:01:00 +00:00
2012-12-09 22:01:00 +00:00
2012-12-09 22:01:00 +00:00
2012-12-10 11:19:42 -05:00