diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 19:24:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 19:24:19 +0200 |
| commit | f478e8500a3d1fb0c6014956de42d87e292b9e3b (patch) | |
| tree | 87becafb3f58cad48a56e43f173f346bb01e8c69 /libavformat | |
| parent | eacf7d650dfe6e97d6100a232fa6a89592b625b5 (diff) | |
| parent | c9281a01b78cc3f09e36300a0ca3f5824d1c74cf (diff) | |
| download | ffmpeg-f478e8500a3d1fb0c6014956de42d87e292b9e3b.tar.gz | |
Merge commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf'
* commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf':
lavf: drop the zero-sized packets hack
Conflicts:
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mux.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 175f157741..a3a63f29a5 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -852,12 +852,6 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt) if (pkt) { AVStream *st = s->streams[pkt->stream_index]; - //FIXME/XXX/HACK drop zero sized packets - if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && pkt->size == 0) { - ret = 0; - goto fail; - } - av_dlog(s, "av_interleaved_write_frame size:%d dts:%s pts:%s\n", pkt->size, av_ts2str(pkt->dts), av_ts2str(pkt->pts)); if ((ret = compute_pkt_fields2(s, st, pkt)) < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) |