← Back to branch summary

~ppsspp/ppsspp/ffmpeg-upstream

~ppsspp/ppsspp/ffmpeg-upstream

« back to all changes in this revision

Viewing changes to libswresample/swresample.c

Committer: Sérgio Benjamim
Date: 2015-07-20 03:55:05 UTC
Revision ID: sergio_br2@yahoo.com.br-20150720035505-i1jj1zcjcnd0mc7w

Updated to 2.7.2.

files modified:
Changelog

RELEASE

configure

doc/Doxyfile

ffmpeg.c

ffmpeg_opt.c

ffmpeg_vda.c

libavcodec/aacsbr.c

libavcodec/alac.c

libavcodec/bytestream.h

libavcodec/diracdec.c

libavcodec/h264_refs.c

libavcodec/h264_slice.c

libavcodec/hevc.c

libavcodec/hevc_parser.c

libavcodec/huffyuvdec.c

libavcodec/imc.c

libavcodec/mjpegdec.c

libavcodec/mpegaudiodec_template.c

libavcodec/mpegvideo.c

libavcodec/pngdec.c

libavcodec/pthread_frame.c

libavcodec/rawenc.c

libavcodec/rv34.c

libavcodec/s302m.c

libavcodec/sanm.c

libavcodec/sbr.h

libavcodec/snow.h

libavcodec/utils.c

libavcodec/vaapi_h264.c

libavcodec/vc1dec.c

libavcodec/vp8.c

libavcodec/vp9.c

libavcodec/wavpack.c

libavcodec/webp.c

libavcodec/wmalosslessdec.c

libavcodec/wmavoice.c

libavfilter/af_aresample.c

libavfilter/vf_transpose.c

libavformat/mov.c

libavformat/nutdec.c

libavformat/oggparsedirac.c

libavformat/swfdec.c

libavutil/fifo.c

libavutil/internal.h

library.mak

libswresample/options.c

libswresample/soxr_resample.c

libswresample/swresample.c

libswresample/swresample_internal.h

libswscale/rgb2rgb.c

libswscale/rgb2rgb.h

libswscale/rgb2rgb_template.c

libswscale/swscale_unscaled.c

libswscale/utils.c

libswscale/x86/rgb2rgb_template.c

Show diffs side-by-side

added added

removed removed

libswresample/swresample.c

173

173

s-> in_ch_layout = s-> user_in_ch_layout;

174

174

s->out_ch_layout = s->user_out_ch_layout;

175

175

176

s->int_sample_fmt= s->user_int_sample_fmt;

177

176

178

if(av_get_channel_layout_nb_channels(s-> in_ch_layout) > SWR_CH_MAX) {

177

179

av_log(s, AV_LOG_WARNING, "Input channel layout 0x%"PRIx64" is invalid or unsupported.\n", s-> in_ch_layout);

178

180

s->in_ch_layout = 0;

Older »