Merge commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c'

* commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c': nullenc: Use the wrapped avframe pseudo-encoder Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago · 64ceeac26a
parent 1dd5f3340e b9ece15a01
commit 64ceeac26a
1 changed files with 2 additions and 2 deletions
--- a/libavformat/nullenc.c
+++ b/libavformat/nullenc.c
@ -30,7 +30,7 @@ AVOutputFormat ff_null_muxer = {
    .name              = "null",
    .long_name         = NULL_IF_CONFIG_SMALL("raw null video"),
    .audio_codec       = AV_NE(AV_CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_S16LE),
-    .video_codec       = AV_CODEC_ID_RAWVIDEO,
+    .video_codec       = AV_CODEC_ID_WRAPPED_AVFRAME,
    .write_packet      = null_write_packet,
-    .flags             = AVFMT_VARIABLE_FPS | AVFMT_NOFILE | AVFMT_NOTIMESTAMPS | AVFMT_RAWPICTURE,
+    .flags             = AVFMT_VARIABLE_FPS | AVFMT_NOFILE | AVFMT_NOTIMESTAMPS,
 };