Merge remote-tracking branch 'qatar/master'
* qatar/master: swfdec: Add support for sample_rate_code 0 (5512 Hz) dct-test: factor out some common code and do whas was likely intended doc: library versions need to be bumped in version.h Revert "ffmpeg: get rid of useless AVInputStream.nb_streams." Remove some forgotten AVCodecContext.palctrl usage. lavc/utils: move avcodec_init() higher in the file. lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_* ac3dec: actually use drc_scale private option lavc: undeprecate AVPALETTE_SIZE and AVPALETTE_COUNT macros alsa: add missing header msmpeg4: remove leftover unused debug variable declaration Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination. Fix av_dlog invocations with wrong or missing logging context. vf_yadif: add support to yuva420p vf_yadif: correct documentation on the parity parameter vf_yadif: copy buffer properties like aspect for second frame as well oma: support for encrypted files id3v2: add support for non-text and GEOB type tag frames des: add possibility to calculate DES-CBC-MAC with small buffer Conflicts: ffmpeg.c libavcodec/dct-test.c libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@ -136,8 +136,9 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
|
||||
ast->need_parsing = AVSTREAM_PARSE_FULL;
|
||||
sample_rate_code= (v>>2) & 3;
|
||||
if (!sample_rate_code)
|
||||
return AVERROR(EIO);
|
||||
ast->codec->sample_rate = 11025 << (sample_rate_code-1);
|
||||
ast->codec->sample_rate = 5512;
|
||||
else
|
||||
ast->codec->sample_rate = 11025 << (sample_rate_code-1);
|
||||
av_set_pts_info(ast, 64, 1, ast->codec->sample_rate);
|
||||
len -= 4;
|
||||
} else if (tag == TAG_VIDEOFRAME) {
|
||||
|
Reference in New Issue
Block a user