diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
commit | a41db36b22053c2cf103899f3510f68ff5645662 (patch) | |
tree | e2e3d734a828caf8e1fbf1373d818f06c979e53d /libmpdemux | |
parent | 267a3f4c9c00848f32c341595d2d831157a79bee (diff) | |
parent | 84fa3d69f360c87fce4efe6acb128ad78d3647e2 (diff) | |
download | mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.bz2 mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.xz |
Merge svn changes up to r26783
Conflicts:
Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_lavf.c | 44 | ||||
-rw-r--r-- | libmpdemux/demux_mf.c | 1 | ||||
-rw-r--r-- | libmpdemux/demux_nemesi.c | 26 | ||||
-rw-r--r-- | libmpdemux/demux_ty.c | 18 | ||||
-rw-r--r-- | libmpdemux/demux_xmms.c | 19 | ||||
-rw-r--r-- | libmpdemux/mp_taglists.c | 1 | ||||
-rw-r--r-- | libmpdemux/mpeg_packetizer.c | 37 | ||||
-rw-r--r-- | libmpdemux/mpeg_packetizer.h | 37 | ||||
-rw-r--r-- | libmpdemux/muxer_lavf.c | 47 | ||||
-rw-r--r-- | libmpdemux/yuv4mpeg.c | 2 | ||||
-rw-r--r-- | libmpdemux/yuv4mpeg.h | 2 | ||||
-rw-r--r-- | libmpdemux/yuv4mpeg_intern.h | 2 | ||||
-rw-r--r-- | libmpdemux/yuv4mpeg_ratio.c | 2 |
13 files changed, 139 insertions, 99 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 79b71a1b9b..79c504a237 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -1,20 +1,22 @@ /* - Copyright (C) 2004 Michael Niedermayer <michaelni@gmx.at> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ + * Copyright (C) 2004 Michael Niedermayer <michaelni@gmx.at> + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ // #include <stdio.h> #include <stdlib.h> @@ -25,6 +27,7 @@ #include "options.h" #include "mp_msg.h" #include "help_mp.h" +#include "av_opts.h" #include "stream/stream.h" #include "demuxer.h" @@ -47,12 +50,14 @@ static unsigned int opt_analyzeduration = 0; static char *opt_format; static char *opt_cryptokey; extern int ts_prog; +static char *opt_avopt = NULL; const m_option_t lavfdopts_conf[] = { {"probesize", &(opt_probesize), CONF_TYPE_INT, CONF_RANGE, 32, INT_MAX, NULL}, {"format", &(opt_format), CONF_TYPE_STRING, 0, 0, 0, NULL}, {"analyzeduration", &(opt_analyzeduration), CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, {"cryptokey", &(opt_cryptokey), CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"o", &opt_avopt, CONF_TYPE_STRING, 0, 0, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -434,6 +439,13 @@ static demuxer_t* demux_open_lavf(demuxer_t *demuxer){ if(!opt) mp_msg(MSGT_HEADER,MSGL_ERR, "demux_lavf, couldn't set option analyzeduration to %u\n", opt_analyzeduration); } + if(opt_avopt){ + if(parse_avopts(avfc, opt_avopt) < 0){ + mp_msg(MSGT_HEADER,MSGL_ERR, "Your options /%s/ look like gibberish to me pal\n", opt_avopt); + return NULL; + } + } + if(demuxer->stream->url) strncpy(mp_filename + 3, demuxer->stream->url, sizeof(mp_filename)-3); else diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c index ae2a839dae..f7c241feed 100644 --- a/libmpdemux/demux_mf.c +++ b/libmpdemux/demux_mf.c @@ -67,6 +67,7 @@ static const struct { { "jpg", mmioFOURCC('I', 'J', 'P', 'G') }, { "pcx", mmioFOURCC('p', 'c', 'x', ' ') }, { "png", mmioFOURCC('M', 'P', 'N', 'G') }, + { "ptx", mmioFOURCC('p', 't', 'x', ' ') }, { "tga", mmioFOURCC('M', 'T', 'G', 'A') }, { "tif", mmioFOURCC('t', 'i', 'f', 'f') }, { "sgi", mmioFOURCC('S', 'G', 'I', '1') }, diff --git a/libmpdemux/demux_nemesi.c b/libmpdemux/demux_nemesi.c index 7575ee6eee..800908b460 100644 --- a/libmpdemux/demux_nemesi.c +++ b/libmpdemux/demux_nemesi.c @@ -1,19 +1,21 @@ /* - * Copyright (C) 2007 Alessandro Molina <amol.wrk@gmail.com> + * Copyright (C) 2007 Alessandro Molina <amol.wrk@gmail.com> * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This file is part of MPlayer. * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * You should have received a copy of the GNU General Public License - * along with MPlayer; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include <stdlib.h> #include <stdio.h> diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index b985bea7d1..b63590daab 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -11,21 +11,21 @@ * However, no code in the following subsection is directly copied from * either author. * + * This file is part of MPlayer. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * MPlayer is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ diff --git a/libmpdemux/demux_xmms.c b/libmpdemux/demux_xmms.c index e156a96bc5..7bd2f6546a 100644 --- a/libmpdemux/demux_xmms.c +++ b/libmpdemux/demux_xmms.c @@ -1,20 +1,21 @@ /* * Copyright (C) 2002-2004 Balatoni Denes and A'rpi * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * This file is part of MPlayer. * - * This program is distributed in the hope that it will be useful, + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ // This is not reentrant because of global static variables, but most of diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index 10e1b55e0b..5bcf739188 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -67,6 +67,7 @@ static const AVCodecTag mp_bmp_tags[] = { { CODEC_ID_FLIC, MKTAG('F', 'L', 'I', 'C')}, { CODEC_ID_IDCIN, MKTAG('I', 'D', 'C', 'I')}, { CODEC_ID_INTERPLAY_VIDEO, MKTAG('I', 'N', 'P', 'V')}, + { CODEC_ID_RL2, MKTAG('R', 'L', '2', 'V')}, { CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V')}, { CODEC_ID_THP, MKTAG('T', 'H', 'P', 'V')}, { CODEC_ID_TIERTEXSEQVIDEO, MKTAG('T', 'S', 'E', 'Q')}, diff --git a/libmpdemux/mpeg_packetizer.c b/libmpdemux/mpeg_packetizer.c index 9fa9383407..72f2fdb188 100644 --- a/libmpdemux/mpeg_packetizer.c +++ b/libmpdemux/mpeg_packetizer.c @@ -1,25 +1,28 @@ /* - * Copyright (C) 2006 Benjamin Zores - * Set of helper routines for building MPEG 1/2 PS/PES packets. + * set of helper routines for building MPEG 1/2 PS/PES packets * - * Based on various code bororwed from vo_mpegpes/vo_dxr2 : - * (C) 2000 Ralph Metzler <ralph@convergence.de> - * Marcus Metzler <marcus@convergence.de> - * Gerard Lantau + * Copyright (C) 2006 Benjamin Zores * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * Based on code borrowed from vo_mpegpes/vo_dxr2: + * (C) 2000 Ralph Metzler <ralph@convergence.de> + * Marcus Metzler <marcus@convergence.de> + * Gerard Lantau * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This file is part of MPlayer. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include <unistd.h> diff --git a/libmpdemux/mpeg_packetizer.h b/libmpdemux/mpeg_packetizer.h index f9874c840a..e193761fc1 100644 --- a/libmpdemux/mpeg_packetizer.h +++ b/libmpdemux/mpeg_packetizer.h @@ -1,25 +1,28 @@ /* - * Copyright (C) 2006 Benjamin Zores - * Set of helper routines for building MPEG 1/2 PS/PES packets. + * helper routines for building MPEG 1/2 PS/PES packets * - * Based on various code bororwed from vo_mpegpes/vo_dxr2 : - * (C) 2000 Ralph Metzler <ralph@convergence.de> - * Marcus Metzler <marcus@convergence.de> - * Gerard Lantau + * Copyright (C) 2006 Benjamin Zores * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * based on code borrowed from vo_mpegpes/vo_dxr2: + * (C) 2000 Ralph Metzler <ralph@convergence.de> + * Marcus Metzler <marcus@convergence.de> + * Gerard Lantau * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This file is part of MPlayer. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef MPLAYER_MPEG_PACKETIZER_H diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c index f1cd641d13..12410f542e 100644 --- a/libmpdemux/muxer_lavf.c +++ b/libmpdemux/muxer_lavf.c @@ -10,6 +10,7 @@ #include "aviheader.h" #include "ms_hdr.h" +#include "av_opts.h" #include "stream/stream.h" #include "muxer.h" @@ -50,6 +51,7 @@ static int mux_rate= 0; static int mux_packet_size= 0; static float mux_preload= 0.5; static float mux_max_delay= 0.7; +static char *mux_avopt = NULL; m_option_t lavfopts_conf[] = { {"format", &(conf_format), CONF_TYPE_STRING, 0, 0, 0, NULL}, @@ -57,12 +59,20 @@ m_option_t lavfopts_conf[] = { {"packetsize", &mux_packet_size, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, {"preload", &mux_preload, CONF_TYPE_FLOAT, CONF_RANGE, 0, INT_MAX, NULL}, {"delay", &mux_max_delay, CONF_TYPE_FLOAT, CONF_RANGE, 0, INT_MAX, NULL}, + {"o", &mux_avopt, CONF_TYPE_STRING, 0, 0, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; +/* This should be transmitted to mp_open() through the filename when + * thread safety is needed but MPlayer == no threads and especially + * not multiple muxers being initialized at once so there is no + * point in the extra complexity, a static is simpler. */ +static muxer_t *priv_data; + static int mp_open(URLContext *h, const char *filename, int flags) { + h->priv_data= priv_data; return 0; } @@ -127,21 +137,21 @@ static muxer_stream_t* lavf_new_stream(muxer_t *muxer, int type) if(!muxer || (type != MUXER_TYPE_VIDEO && type != MUXER_TYPE_AUDIO)) { - mp_msg(MSGT_MUXER, MSGL_ERR, "UNKNOW TYPE %d\n", type); + mp_msg(MSGT_MUXER, MSGL_ERR, "UNKNOWN TYPE %d\n", type); return NULL; } stream = calloc(1, sizeof(muxer_stream_t)); if(!stream) { - mp_msg(MSGT_MUXER, MSGL_ERR, "Could not alloc muxer_stream, EXIT\n"); + mp_msg(MSGT_MUXER, MSGL_ERR, "Could not allocate muxer_stream, EXIT.\n"); return NULL; } muxer->streams[muxer->avih.dwStreams] = stream; stream->b_buffer = malloc(2048); if(!stream->b_buffer) { - mp_msg(MSGT_MUXER, MSGL_ERR, "Could not alloc b_buffer, EXIT\n"); + mp_msg(MSGT_MUXER, MSGL_ERR, "Could not allocate b_buffer, EXIT.\n"); free(stream); return NULL; } @@ -160,7 +170,7 @@ static muxer_stream_t* lavf_new_stream(muxer_t *muxer, int type) spriv->avstream = av_new_stream(priv->oc, 1); if(!spriv->avstream) { - mp_msg(MSGT_MUXER, MSGL_ERR, "Could not alloc avstream, EXIT\n"); + mp_msg(MSGT_MUXER, MSGL_ERR, "Could not allocate avstream, EXIT.\n"); return NULL; } spriv->avstream->stream_copy = 1; @@ -223,7 +233,7 @@ static void fix_parameters(muxer_stream_t *stream) memcpy(ctx->extradata, stream->wf+1, ctx->extradata_size); } else - mp_msg(MSGT_MUXER, MSGL_ERR, "MUXER_LAVF(audio stream) error! couldn't allocate %d bytes for extradata\n", + mp_msg(MSGT_MUXER, MSGL_ERR, "MUXER_LAVF(audio stream) error! Could not allocate %d bytes for extradata.\n", stream->wf->cbSize); } } @@ -248,7 +258,7 @@ static void fix_parameters(muxer_stream_t *stream) memcpy(ctx->extradata, stream->bih+1, ctx->extradata_size); else { - mp_msg(MSGT_MUXER, MSGL_ERR, "MUXER_LAVF(video stream) error! couldn't allocate %d bytes for extradata\n", + mp_msg(MSGT_MUXER, MSGL_ERR, "MUXER_LAVF(video stream) error! Could not allocate %d bytes for extradata.\n", ctx->extradata_size); ctx->extradata_size = 0; } @@ -281,7 +291,7 @@ static void write_chunk(muxer_stream_t *stream, size_t len, unsigned int flags, if(av_interleaved_write_frame(priv->oc, &pkt) != 0) //av_write_frame(priv->oc, &pkt) { - mp_msg(MSGT_MUXER, MSGL_ERR, "Error while writing frame\n"); + mp_msg(MSGT_MUXER, MSGL_ERR, "Error while writing frame.\n"); } } @@ -340,7 +350,7 @@ int muxer_init_muxer_lavf(muxer_t *muxer) mp_msg(MSGT_MUXER, MSGL_WARN, "** MUXER_LAVF *****************************************************************\n"); mp_msg(MSGT_MUXER, MSGL_WARN, "REMEMBER: MEncoder's libavformat muxing is presently broken and can generate\n" -"INCORRECT files in the presence of B frames. Moreover, due to bugs MPlayer\n" +"INCORRECT files in the presence of B-frames. Moreover, due to bugs MPlayer\n" "will play these INCORRECT files as if nothing were wrong!\n" "*******************************************************************************\n"); @@ -351,7 +361,7 @@ int muxer_init_muxer_lavf(muxer_t *muxer) priv->oc = av_alloc_format_context(); if(!priv->oc) { - mp_msg(MSGT_MUXER, MSGL_FATAL, "Couldn't get format context\n"); + mp_msg(MSGT_MUXER, MSGL_FATAL, "Could not get format context.\n"); goto fail; } @@ -361,7 +371,7 @@ int muxer_init_muxer_lavf(muxer_t *muxer) fmt = guess_format(NULL, out_filename, NULL); if(! fmt) { - mp_msg(MSGT_MUXER, MSGL_FATAL, "CAN'T GET SPECIFIED FORMAT\n"); + mp_msg(MSGT_MUXER, MSGL_FATAL, "Cannot get specified format.\n"); goto fail; } priv->oc->oformat = fmt; @@ -369,7 +379,7 @@ int muxer_init_muxer_lavf(muxer_t *muxer) if(av_set_parameters(priv->oc, NULL) < 0) { - mp_msg(MSGT_MUXER, MSGL_FATAL, "Invalid output format parameters\n"); + mp_msg(MSGT_MUXER, MSGL_FATAL, "invalid output format parameters\n"); goto fail; } priv->oc->packet_size= mux_packet_size; @@ -386,23 +396,30 @@ int muxer_init_muxer_lavf(muxer_t *muxer) av_strlcpy(priv->oc->copyright, info_copyright, sizeof(priv->oc->copyright)); if (info_comment) av_strlcpy(priv->oc->comment , info_comment, sizeof(priv->oc->comment )); + + if(mux_avopt){ + if(parse_avopts(priv->oc, mux_avopt) < 0){ + mp_msg(MSGT_MUXER,MSGL_ERR, "Your options /%s/ look like gibberish to me pal.\n", mux_avopt); + goto fail; + } + } + register_protocol(&mp_protocol); + priv_data= muxer; if(url_fopen(&priv->oc->pb, mp_filename, URL_WRONLY)) { - mp_msg(MSGT_MUXER, MSGL_FATAL, "Could not open outfile\n"); + mp_msg(MSGT_MUXER, MSGL_FATAL, "Could not open outfile.\n"); goto fail; } - ((URLContext*)(priv->oc->pb->opaque))->priv_data= muxer; - muxer->priv = (void *) priv; muxer->cont_new_stream = &lavf_new_stream; muxer->cont_write_chunk = &write_chunk; muxer->cont_write_header = &write_header; muxer->cont_write_index = &write_trailer; muxer->fix_stream_parameters = &fix_parameters; - mp_msg(MSGT_MUXER, MSGL_INFO, "OK, exit\n"); + mp_msg(MSGT_MUXER, MSGL_INFO, "OK, exit.\n"); return 1; fail: diff --git a/libmpdemux/yuv4mpeg.c b/libmpdemux/yuv4mpeg.c index 04b959e9dc..e34e806179 100644 --- a/libmpdemux/yuv4mpeg.c +++ b/libmpdemux/yuv4mpeg.c @@ -3,7 +3,7 @@ * * Copyright (C) 2001 Matthew J. Marjanovic <maddog@mir.com> * - * This file is ripped from the lavtools package (mjpeg.sourceforge.net) + * This file is part of the MJPEG Tools package (mjpeg.sourceforge.net). * Ported to mplayer by Rik Snel <rsnel@cube.dyndns.org> * * This program is free software; you can redistribute it and/or diff --git a/libmpdemux/yuv4mpeg.h b/libmpdemux/yuv4mpeg.h index 3609388596..87b71140ea 100644 --- a/libmpdemux/yuv4mpeg.h +++ b/libmpdemux/yuv4mpeg.h @@ -6,7 +6,7 @@ * * Copyright (C) 2001 Matthew J. Marjanovic <maddog@mir.com> * - * This file is ripped from the lavtools package (mjpeg.sourceforge.net) + * This file is part of the MJPEG Tools package (mjpeg.sourceforge.net). * Ported to mplayer by Rik Snel <rsnel@cube.dyndns.org> * * This program is free software; you can redistribute it and/or diff --git a/libmpdemux/yuv4mpeg_intern.h b/libmpdemux/yuv4mpeg_intern.h index a956bbf4e9..f2d755345e 100644 --- a/libmpdemux/yuv4mpeg_intern.h +++ b/libmpdemux/yuv4mpeg_intern.h @@ -3,7 +3,7 @@ * * Copyright (C) 2001 Andrew Stevens <andrew.stevens@philips.com> * - * This file is part of the lavtools package (mjpeg.sourceforge.net). + * This file is part of the MJPEG Tools package (mjpeg.sourceforge.net). * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public License diff --git a/libmpdemux/yuv4mpeg_ratio.c b/libmpdemux/yuv4mpeg_ratio.c index 93b084d1ed..6413a50ee2 100644 --- a/libmpdemux/yuv4mpeg_ratio.c +++ b/libmpdemux/yuv4mpeg_ratio.c @@ -3,7 +3,7 @@ * * Copyright (C) 2001 Matthew J. Marjanovic <maddog@mir.com> * - * This file is part of the lavtools packaged (mjpeg.sourceforge.net) + * This file is part of the MJPEG Tools package (mjpeg.sourceforge.net). * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License |