diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2006-02-05 14:11:16 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2006-02-05 14:11:16 +0000 |
| commit | 40c9e400fdaf1e9bb49eb0d0f0e437025b0ab6e8 (patch) | |
| tree | 0a0d683a843d5d50b12233116b777e8e2780cad9 /src/libffmpeg/libavcodec/cyuv.c | |
| parent | 9a299a12ea17a363354f451d2efd15bfbf3c7dc6 (diff) | |
| download | xine-lib-40c9e400fdaf1e9bb49eb0d0f0e437025b0ab6e8.tar.gz xine-lib-40c9e400fdaf1e9bb49eb0d0f0e437025b0ab6e8.tar.bz2 | |
ffmpeg sync
CVS patchset: 7872
CVS date: 2006/02/05 14:11:16
Diffstat (limited to 'src/libffmpeg/libavcodec/cyuv.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/cyuv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libffmpeg/libavcodec/cyuv.c b/src/libffmpeg/libavcodec/cyuv.c index 34de8cc04..b64e1a58b 100644 --- a/src/libffmpeg/libavcodec/cyuv.c +++ b/src/libffmpeg/libavcodec/cyuv.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * Creative YUV (CYUV) Video Decoder * by Mike Melanson (melanson@pcisys.net) @@ -24,10 +24,10 @@ */ /** - * @file cyuv.c + * @file cyuv.c * Creative YUV (CYUV) Video Decoder. */ - + #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -61,7 +61,7 @@ static int cyuv_decode_init(AVCodecContext *avctx) return 0; } -static int cyuv_decode_frame(AVCodecContext *avctx, +static int cyuv_decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size) { @@ -114,7 +114,7 @@ static int cyuv_decode_frame(AVCodecContext *avctx, /* iterate through each line in the height */ for (y_ptr = 0, u_ptr = 0, v_ptr = 0; - y_ptr < (s->height * s->frame.linesize[0]); + y_ptr < (s->height * s->frame.linesize[0]); y_ptr += s->frame.linesize[0] - s->width, u_ptr += s->frame.linesize[1] - s->width / 4, v_ptr += s->frame.linesize[2] - s->width / 4) { |