* qatar/master: swscale: Readd #define _SVID_SOURCE Fix av_get_channel_layout_string() for positions >31 configure: Store vda lib flags in extralibs instead of ldflags Make channel layout masks unsigned dca: ARMv6 optimised decode_blockcode() nullenc: drop AVFMT_RAWPICTURE from the flags frame-mt: return consumed packet size in ff_thread_decode_frame aacdec: add more fate tests covering SBR and PS MK(BE)TAG: avoid undefined shifts Conflicts: configure libavcodec/arm/dca.h libavcodec/dca.c libavcodec/mlp_parser.c libavcodec/version.h libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/defaults.c libavutil/audioconvert.c libavutil/avutil.h libswscale/utils.c
Showing the changes to libavfilter/avfilter.c (1 of 28 files). Show all
Unified · Split
| @@ -473,7 +473,7 @@ AVFilterBufferRef *avfilter_get_audio_buffer(AVFilterLink *link, · 472 unmodified lines | ||
| 473 | 473 | AVFilterBufferRef * |
| 474 | 474 | avfilter_get_audio_buffer_ref_from_arrays(uint8_t *data[8], int linesize[8], int perms, |
| 475 | 475 | int nb_samples, enum AVSampleFormat sample_fmt, |
| 476 | − int64_t channel_layout, int planar) | |
| 476 | + uint64_t channel_layout, int planar) | |
| 477 | 477 | { |
| 478 | 478 | AVFilterBuffer *samples = av_mallocz(sizeof(AVFilterBuffer)); |
| 479 | 479 | AVFilterBufferRef *samplesref = av_mallocz(sizeof(AVFilterBufferRef)); |