highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
a176bbc873b13430c683625744cb15bd659fcd58
ffmpeg/libavcodec/h264_sei.c
Michael Niedermayer 441d5a7084 Merge commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37' 
* commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37':
  h264: Add support for Closed Caption export

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_sei.c

See: 8234f0e3b4
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 14:13:19 +02:00

19 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink