patched-ffmpeg-mt/libavformat/img2.c - Issue 789004: ffmpeg roll of source to mar 9 version...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: patched-ffmpeg-mt/libavformat/img2.c

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/

Patch Set: '' Created 10 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 /*	1 /*

2 * Image format	2 * Image format

3 * Copyright (c) 2000, 2001, 2002 Fabrice Bellard	3 * Copyright (c) 2000, 2001, 2002 Fabrice Bellard

4 * Copyright (c) 2004 Michael Niedermayer	4 * Copyright (c) 2004 Michael Niedermayer

5 *	5 *

6 * This file is part of FFmpeg.	6 * This file is part of FFmpeg.

7 *	7 *

8 * FFmpeg is free software; you can redistribute it and/or	8 * FFmpeg is free software; you can redistribute it and/or

9 * modify it under the terms of the GNU Lesser General Public	9 * modify it under the terms of the GNU Lesser General Public

10 * License as published by the Free Software Foundation; either	10 * License as published by the Free Software Foundation; either

(...skipping 428 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
439 "image2",	439 "image2",

440 NULL_IF_CONFIG_SMALL("image2 sequence"),	440 NULL_IF_CONFIG_SMALL("image2 sequence"),

441 "",	441 "",

442 "bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,ppm,sgi,tif,tiff,jp2",	442 "bmp,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png,ppm,sgi,tif,tiff,jp2",

443 sizeof(VideoData),	443 sizeof(VideoData),

444 CODEC_ID_NONE,	444 CODEC_ID_NONE,

445 CODEC_ID_MJPEG,	445 CODEC_ID_MJPEG,

446 img_write_header,	446 img_write_header,

447 img_write_packet,	447 img_write_packet,

448 NULL,	448 NULL,

449 .flags= AVFMT_NOTIMESTAMPS \| AVFMT_NOFILE	449 .flags= AVFMT_NOTIMESTAMPS \| AVFMT_NODIMENSIONS \| AVFMT_NOFILE

450 };	450 };

451 #endif	451 #endif

452 #if CONFIG_IMAGE2PIPE_MUXER	452 #if CONFIG_IMAGE2PIPE_MUXER

453 AVOutputFormat image2pipe_muxer = {	453 AVOutputFormat image2pipe_muxer = {

454 "image2pipe",	454 "image2pipe",

455 NULL_IF_CONFIG_SMALL("piped image2 sequence"),	455 NULL_IF_CONFIG_SMALL("piped image2 sequence"),

456 "",	456 "",

457 "",	457 "",

458 sizeof(VideoData),	458 sizeof(VideoData),

459 CODEC_ID_NONE,	459 CODEC_ID_NONE,

460 CODEC_ID_MJPEG,	460 CODEC_ID_MJPEG,

461 img_write_header,	461 img_write_header,

462 img_write_packet,	462 img_write_packet,

463 .flags= AVFMT_NOTIMESTAMPS	463 .flags= AVFMT_NOTIMESTAMPS \| AVFMT_NODIMENSIONS

464 };	464 };

465 #endif	465 #endif

OLD	NEW

« patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c ('K') | « patched-ffmpeg-mt/libavformat/iff.c ('k') | patched-ffmpeg-mt/libavformat/internal.h » ('j') | no next file with comments »