eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 05:35:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
be63ef3c4e6399a3ef8d22cc25e9cb3575cf74ae
ffmpeg/libavcodec/vaapi_encode_h264.c
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

48 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink