diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-05-12 19:38:47 +0400 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-05-16 15:16:05 +0400 |
| commit | 4d4098da009c8340997b8d1abedbf2062e4aa991 (patch) | |
| tree | 2a2398b82a55b8a5feeaa87ece2fefbd5c83036d /libavfilter/af_ashowinfo.c | |
| parent | 183596fa081cc283c61ba3c0bb8386f9139f761f (diff) | |
lavfi: drop planar/packed negotiation support
The planar/packed switch and the packing_formats list is no longer
required, since the planar/packed information is now stored in the sample
format enum.
This is technically a major API break, possibly it should be not too
painful as we marked the audio filtering API as unstable.
Diffstat (limited to 'libavfilter/af_ashowinfo.c')
| -rw-r--r-- | libavfilter/af_ashowinfo.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c index 11d85f09c7..d4198e9a9f 100644 --- a/libavfilter/af_ashowinfo.c +++ b/libavfilter/af_ashowinfo.c @@ -50,7 +50,7 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref) int linesize = samplesref->audio->nb_samples * av_get_bytes_per_sample(samplesref->format); - if (!samplesref->audio->planar) /* packed layout */ + if (!av_sample_fmt_is_planar(samplesref->format)) linesize *= av_get_channel_layout_nb_channels(samplesref->audio->channel_layout); for (plane = 0; samplesref->data[plane] && plane < 8; plane++) { @@ -66,7 +66,7 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref) av_log(ctx, AV_LOG_INFO, "n:%d pts:%s pts_time:%s pos:%"PRId64" " - "fmt:%s chlayout:%s nb_samples:%d rate:%d planar:%d " + "fmt:%s chlayout:%s nb_samples:%d rate:%d " "checksum:%08X plane_checksum[%08X", showinfo->frame, av_ts2str(samplesref->pts), av_ts2timestr(samplesref->pts, &inlink->time_base), @@ -75,7 +75,6 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref) chlayout_str, samplesref->audio->nb_samples, samplesref->audio->sample_rate, - samplesref->audio->planar, checksum, plane_checksum[0]); |