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

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/avcodec.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 12 matching lines...) Expand all
23 23
24 /** 24 /**
25 * @file 25 * @file
26 * external API header 26 * external API header
27 */ 27 */
28 28
29 #include <errno.h> 29 #include <errno.h>
30 #include "libavutil/avutil.h" 30 #include "libavutil/avutil.h"
31 31
32 #define LIBAVCODEC_VERSION_MAJOR 52 32 #define LIBAVCODEC_VERSION_MAJOR 52
33 #define LIBAVCODEC_VERSION_MINOR 77 33 #define LIBAVCODEC_VERSION_MINOR 78
34 #define LIBAVCODEC_VERSION_MICRO 0 34 #define LIBAVCODEC_VERSION_MICRO 0
35 35
36 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ 36 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
37 LIBAVCODEC_VERSION_MINOR, \ 37 LIBAVCODEC_VERSION_MINOR, \
38 LIBAVCODEC_VERSION_MICRO) 38 LIBAVCODEC_VERSION_MICRO)
39 #define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_MAJOR, \ 39 #define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_MAJOR, \
40 LIBAVCODEC_VERSION_MINOR, \ 40 LIBAVCODEC_VERSION_MINOR, \
41 LIBAVCODEC_VERSION_MICRO) 41 LIBAVCODEC_VERSION_MICRO)
42 #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT 42 #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
43 43
(...skipping 4014 matching lines...) Expand 10 before | Expand all | Expand 10 after
4058 * @param cb User defined callback. Note: FFmpeg may invoke calls to this 4058 * @param cb User defined callback. Note: FFmpeg may invoke calls to this
4059 * callback during the call to av_lockmgr_register(). 4059 * callback during the call to av_lockmgr_register().
4060 * Thus, the application must be prepared to handle that. 4060 * Thus, the application must be prepared to handle that.
4061 * If cb is set to NULL the lockmgr will be unregistered. 4061 * If cb is set to NULL the lockmgr will be unregistered.
4062 * Also note that during unregistration the previously registered 4062 * Also note that during unregistration the previously registered
4063 * lockmgr callback may also be invoked. 4063 * lockmgr callback may also be invoked.
4064 */ 4064 */
4065 int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op)); 4065 int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op));
4066 4066
4067 #endif /* AVCODEC_AVCODEC_H */ 4067 #endif /* AVCODEC_AVCODEC_H */
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/allcodecs.c ('k') | source/patched-ffmpeg-mt/libavcodec/dca.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698