On Sun, Jul 13, 2014 at 07:32:56PM +0100, Derek Buitenhuis wrote:
> mplayer-specifc hacks should not be in our codebase. mplayer should fix
> it's own code. It is not our responsibility to work around their broken
> code.
>
> This reverts commit e8e575633faf19711910cf9caf59f7db300a9ccd.
>
> Signed-off-by: Derek Buitenhuis <derek.buitenh...@gmail.com>
> ---
> libavcodec/utils.c | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/utils.c b/libavcodec/utils.c
> index 9fa8e16..6a8992a 100644
> --- a/libavcodec/utils.c
> +++ b/libavcodec/utils.c
> @@ -1533,9 +1533,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext
> *avctx, const AVCodec *code
> } else if (avctx->channel_layout) {
> avctx->channels =
> av_get_channel_layout_nb_channels(avctx->channel_layout);
> }
> - if(avctx->codec_type == AVMEDIA_TYPE_VIDEO &&
> - avctx->codec_id != AV_CODEC_ID_PNG // For mplayer
> - ) {
> + if(avctx->codec_type == AVMEDIA_TYPE_VIDEO) {this should be under a LIBAVCODEC_VERSION_MAJOR check otherwise existing binary mplayer packages would break if libavodec is updated that is unless iam missing something [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Why not whip the teacher when the pupil misbehaves? -- Diogenes of Sinope
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
