ffmpeg/libavformat
James Almer f41048f6ec Merge commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c'
* commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c':
  h264: add H264_ prefix to the NAL unit types

Conflicts:
libavcodec/h264_parse.c
libavcodec/h264_parser.c
libavcodec/h264_slice.c
libavcodec/h264dec.c

Merged-by: James Almer <jamrial@gmail.com>
2016-08-01 15:11:05 -03:00
..
2016-07-03 04:37:48 +02:00
2016-07-03 04:37:48 +02:00
2016-07-20 22:32:43 -03:00
2016-03-13 16:06:09 +01:00
2016-07-17 13:10:27 -03:00
2016-06-19 18:51:39 +02:00
2016-06-19 18:51:39 +02:00
2016-07-17 13:10:27 -03:00
2016-04-28 23:25:18 +02:00
2016-05-04 18:16:21 +02:00
2016-06-16 23:55:21 +02:00
2016-05-04 18:16:21 +02:00
2016-05-19 17:02:06 +02:00
2016-07-15 10:25:02 +02:00
2014-07-13 19:18:31 +02:00
2014-07-13 19:18:31 +02:00
2016-07-20 22:32:43 -03:00
2016-05-21 18:49:45 +02:00
2016-07-21 03:02:24 +02:00
2016-02-26 21:34:33 +01:00
2016-07-19 18:41:19 +02:00
2016-07-17 13:10:27 -03:00
2016-07-05 02:31:35 +02:00
2015-09-01 13:35:37 +02:00
2014-10-21 03:52:27 +02:00
2016-07-17 13:10:27 -03:00
2016-06-25 15:53:11 -05:00
2016-05-03 15:45:10 +02:00
2016-07-20 22:32:43 -03:00
2015-01-11 00:35:01 +01:00