On 12/09/17 02:43, James Almer wrote: > On 8/20/2017 7:41 PM, Mark Thompson wrote: >> This avoids confusion with equivalent H.265 SEI values when both are >> being used at the same time. >> >> (cherry picked from commit 6ea220cbeec8863e2006a03b73bed52db2b13ee7) >> --- >> libavcodec/h264_parser.c | 26 ++++++++++++------------- >> libavcodec/h264_sei.c | 20 ++++++++++---------- >> libavcodec/h264_sei.h | 43 >> +++++++++++++++++++++--------------------- >> libavcodec/h264_slice.c | 24 +++++++++++------------ >> libavcodec/vaapi_encode_h264.c | 6 +++--- >> 5 files changed, 60 insertions(+), 59 deletions(-) > > LGTM.
Applied with a missed reference in videotoolboxenc fixed. (New version of the rest of this set to follow soon.) Thanks, - Mark _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
