diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-20 02:23:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-20 02:34:51 +0200 |
| commit | d0492578c805cfd41673aa2cdadf52efde40e307 (patch) | |
| tree | 14fa2c0efa9f3a2c16d946cad36bc10edf0b39f6 /libavformat/psxstr.c | |
| parent | 9ef714328c9527f67be193a120821048b1fe86b5 (diff) | |
| parent | 8096fdf0b6886305ea1a8cb2c869ab2732cd8e11 (diff) | |
| download | ffmpeg-d0492578c805cfd41673aa2cdadf52efde40e307.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
presets: rename presets directory
lavc: make avcodec_get_context_defaults3 "officially" public
lavf: replace av_new_stream->avformat_new_stream part II.
lavf,lavd: replace av_new_stream->avformat_new_stream part I.
lavf: add avformat_new_stream as a replacement for av_new_stream.
Use correct scaling table for bwd-pred MVs in second B-field
Ut Video decoder
Makefile: change presets extension to .avpreset
lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs
lavfi: add testsrc source
AVOptions: add documentation.
presets: update libx264 ffpresets
Conflicts:
Changelog
doc/APIchanges
doc/ffmpeg.texi
ffpresets/libx264-ipod320.ffpreset
ffpresets/libx264-ipod640.ffpreset
ffserver.c
libavcodec/avcodec.h
libavcodec/options.c
libavcodec/version.h
libavdevice/libdc1394.c
libavfilter/avfilter.h
libavfilter/vsrc_testsrc.c
libavformat/flvdec.c
libavformat/riff.c
libavformat/version.h
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/psxstr.c')
| -rw-r--r-- | libavformat/psxstr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index 398e44e128..675a4b11df 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -196,7 +196,7 @@ static int str_read_packet(AVFormatContext *s, if(str->channels[channel].video_stream_index < 0){ /* allocate a new AVStream */ - st = av_new_stream(s, 0); + st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); av_set_pts_info(st, 64, 1, 15); @@ -244,7 +244,7 @@ static int str_read_packet(AVFormatContext *s, if(str->channels[channel].audio_stream_index < 0){ int fmt = sector[0x13]; /* allocate a new AVStream */ - st = av_new_stream(s, 0); + st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); |