Merge commit '390b95b88b2b896b63f257f69e434dfc0111e076'

* commit '390b95b88b2b896b63f257f69e434dfc0111e076':
  fate: Add a mixed NAL coding sample

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

tests/fate/h264.mak

@@ -206,6 +206,10 @@ FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-interlace-crop
 # by using a previous ref frame instead of a missing one
 FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-invalid-ref-mod
 
+# this sample gives an explicit size for a single NAL unit, but contains
+# several NAL units
+FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-mixed-nal-coding
+
 # this sample has invalid extradata that is not escaped
 FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-unescaped-extradata
 
@@ -423,6 +427,7 @@ fate-h264-skip-nokey:                             CMD = framecrc -skip_frame nok
 fate-h264-skip-nointra:                           CMD = framecrc -skip_frame nointra -i $(TARGET_SAMPLES)/h264/h264_intra_first-small.ts
 fate-h264-invalid-ref-mod:                        CMD = framecrc -i $(TARGET_SAMPLES)/h264/h264refframeregression.mp4 -an -frames 10 -pix_fmt yuv420p10le
 fate-h264-lossless:                               CMD = framecrc -i $(TARGET_SAMPLES)/h264/lossless.h264
+fate-h264-mixed-nal-coding:                       CMD = framecrc -i $(TARGET_SAMPLES)/h264/mixed-nal-coding.mp4
 fate-h264-unescaped-extradata:                    CMD = framecrc -i $(TARGET_SAMPLES)/h264/unescaped_extradata.mp4 -an -frames 10
 fate-h264-3386:                                   CMD = framecrc -i $(TARGET_SAMPLES)/h264/bbc2.sample.h264
 

tests/ref/fate/h264-mixed-nal-coding

@@ -0,0 +1,10 @@
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 40/33
+0,          0,          0,        1,   518400, 0x8f882e4d
+0,          1,          1,        1,   518400, 0xc5694144
+0,          2,          2,        1,   518400, 0xcf0e9e3a
+0,          3,          3,        1,   518400, 0xf620e459
+0,          4,          4,        1,   518400, 0x4566453e