[FFmpeg-devel] [PATCH 1/2] lavc: do not init frame with guessed layout.
Michael Niedermayer
michaelni at gmx.at
Mon Apr 1 19:00:52 CEST 2013
On Mon, Apr 01, 2013 at 03:53:43PM +0200, Nicolas George wrote:
> It is breaking support from files with unknown layout.
>
> Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
> ---
> libavcodec/utils.c | 2 --
> tests/ref/fate/ffprobe_compact | 12 ++++++------
> tests/ref/fate/ffprobe_csv | 12 ++++++------
> tests/ref/fate/ffprobe_default | 12 ++++++------
> tests/ref/fate/ffprobe_flat | 12 ++++++------
> tests/ref/fate/ffprobe_ini | 12 ++++++------
> tests/ref/fate/ffprobe_json | 18 ++++++------------
> tests/ref/fate/ffprobe_xml | 12 ++++++------
> 8 files changed, 42 insertions(+), 50 deletions(-)
>
> diff --git a/libavcodec/utils.c b/libavcodec/utils.c
> index a341a7d..064b473 100644
> --- a/libavcodec/utils.c
> +++ b/libavcodec/utils.c
> @@ -651,8 +651,6 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame)
> avctx->channels);
> return AVERROR(ENOSYS);
> }
> -
> - frame->channel_layout = av_get_default_channel_layout(avctx->channels);
> }
> }
> av_frame_set_channels(frame, avctx->channels);
somewhat off topic but maybe guess layout max could be moved from
ffmpeg to libavcodec
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
The real ebay dictionary, page 1
"Used only once" - "Some unspecified defect prevented a second use"
"In good condition" - "Can be repaird by experienced expert"
"As is" - "You wouldnt want it even if you were payed for it, if you knew ..."
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20130401/42cbbaf8/attachment.asc>
More information about the ffmpeg-devel
mailing list