Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(723)

Side by Side Diff: source/patched-ffmpeg-mt/libavformat/avformat.h

Issue 2850032: ffmpeg update to june 23 version which fixes mp4 crash on still frames with 3... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 6 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
OLDNEW
1 /* 1 /*
2 * copyright (c) 2001 Fabrice Bellard 2 * copyright (c) 2001 Fabrice Bellard
3 * 3 *
4 * This file is part of FFmpeg. 4 * This file is part of FFmpeg.
5 * 5 *
6 * FFmpeg is free software; you can redistribute it and/or 6 * FFmpeg is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Lesser General Public 7 * modify it under the terms of the GNU Lesser General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2.1 of the License, or (at your option) any later version. 9 * version 2.1 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 AVRational time_base; ///< time base in which the start/end timestamps are specified 562 AVRational time_base; ///< time base in which the start/end timestamps are specified
563 int64_t start, end; ///< chapter start/end time in time_base units 563 int64_t start, end; ///< chapter start/end time in time_base units
564 #if LIBAVFORMAT_VERSION_INT < (53<<16) 564 #if LIBAVFORMAT_VERSION_INT < (53<<16)
565 char *title; ///< chapter title 565 char *title; ///< chapter title
566 #endif 566 #endif
567 AVMetadata *metadata; 567 AVMetadata *metadata;
568 } AVChapter; 568 } AVChapter;
569 569
570 #if LIBAVFORMAT_VERSION_MAJOR < 53 570 #if LIBAVFORMAT_VERSION_MAJOR < 53
571 #define MAX_STREAMS 20 571 #define MAX_STREAMS 20
572 #else
573 #define MAX_STREAMS 100
574 #endif 572 #endif
575 573
576 /** 574 /**
577 * Format I/O context. 575 * Format I/O context.
578 * New fields can be added to the end with minor version bumps. 576 * New fields can be added to the end with minor version bumps.
579 * Removal, reordering and changes to existing fields require a major 577 * Removal, reordering and changes to existing fields require a major
580 * version bump. 578 * version bump.
581 * sizeof(AVFormatContext) must not be used outside libav*. 579 * sizeof(AVFormatContext) must not be used outside libav*.
582 */ 580 */
583 typedef struct AVFormatContext { 581 typedef struct AVFormatContext {
(...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after
1362 1360
1363 /** 1361 /**
1364 * Returns a positive value if the given filename has one of the given 1362 * Returns a positive value if the given filename has one of the given
1365 * extensions, 0 otherwise. 1363 * extensions, 0 otherwise.
1366 * 1364 *
1367 * @param extensions a comma-separated list of filename extensions 1365 * @param extensions a comma-separated list of filename extensions
1368 */ 1366 */
1369 int av_match_ext(const char *filename, const char *extensions); 1367 int av_match_ext(const char *filename, const char *extensions);
1370 1368
1371 #endif /* AVFORMAT_AVFORMAT_H */ 1369 #endif /* AVFORMAT_AVFORMAT_H */
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/Makefile ('k') | source/patched-ffmpeg-mt/libavformat/http.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698