diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 13:48:22 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 13:48:22 +0200 |
| commit | 64ceeac26a441ede6eaf4bb99a5c3224b1803745 (patch) | |
| tree | 80e0f111260eb0b13a5ab17a30c5859d92c4d30e | |
| parent | 1dd5f3340e002bf923fbfd4774afe3fafc6ad713 (diff) | |
| parent | b9ece15a01782b4f301c0c139d1d7b20f848914c (diff) | |
| download | ffmpeg-64ceeac26a441ede6eaf4bb99a5c3224b1803745.tar.gz | |
Merge commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c'
* commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c':
nullenc: Use the wrapped avframe pseudo-encoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavformat/nullenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/nullenc.c b/libavformat/nullenc.c index 7c08c396e8..fd293d72a6 100644 --- 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, }; |