diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 17:40:22 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 17:40:22 +0400 |
| commit | e79c3858b35fcc77c68c33b627958e736686957e (patch) | |
| tree | 5f933517c2909def4e2930a409b0a460eb4f41fd /libavformat/dv.c | |
| parent | cd37963684d8ee9819af15ccebe09d84839101dd (diff) | |
| parent | 14f031d7ecfabba0ef02776d4516aa3dcb7c40d8 (diff) | |
Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8'
* commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8':
dv: use AVStream.index instead of abusing AVStream.id
lavfi: add ashowinfo filter
avcodec: Add a RFC 3389 comfort noise codec
lpc: Add a function for calculating reflection coefficients from samples
lpc: Add a function for calculating reflection coefficients from autocorrelation coefficients
lavr: document upper bound on number of output samples.
lavr: add general API usage doxy
indeo3: remove duplicate capabilities line.
fate: ac3: Add dependencies
Conflicts:
Changelog
doc/filters.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavfilter/Makefile
libavfilter/af_ashowinfo.c
libavfilter/allfilters.c
libavfilter/version.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/dv.c')
| -rw-r--r-- | libavformat/dv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/dv.c b/libavformat/dv.c index 1d5ec2cf89..75d2136628 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -391,7 +391,7 @@ int avpriv_dv_produce_packet(DVDemuxContext *c, AVPacket *pkt, pkt->pos = pos; pkt->size = size; pkt->flags |= AV_PKT_FLAG_KEY; - pkt->stream_index = c->vst->id; + pkt->stream_index = c->vst->index; pkt->pts = c->frames; c->frames++; |