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

Side by Side Diff: source/patched-ffmpeg-mt/libavdevice/avdevice.h

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 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 * This file is part of FFmpeg. 2 * This file is part of FFmpeg.
3 * 3 *
4 * FFmpeg is free software; you can redistribute it and/or 4 * FFmpeg is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Lesser General Public 5 * modify it under the terms of the GNU Lesser General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2.1 of the License, or (at your option) any later version. 7 * version 2.1 of the License, or (at your option) any later version.
8 * 8 *
9 * FFmpeg is distributed in the hope that it will be useful, 9 * FFmpeg is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Lesser General Public License for more details. 12 * Lesser General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Lesser General Public 14 * You should have received a copy of the GNU Lesser General Public
15 * License along with FFmpeg; if not, write to the Free Software 15 * License along with FFmpeg; if not, write to the Free Software
16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17 */ 17 */
18 18
19 #ifndef AVDEVICE_AVDEVICE_H 19 #ifndef AVDEVICE_AVDEVICE_H
20 #define AVDEVICE_AVDEVICE_H 20 #define AVDEVICE_AVDEVICE_H
21 21
22 #include "libavutil/avutil.h" 22 #include "libavutil/avutil.h"
23 23
24 #define LIBAVDEVICE_VERSION_MAJOR 52 24 #define LIBAVDEVICE_VERSION_MAJOR 52
25 #define LIBAVDEVICE_VERSION_MINOR 2 25 #define LIBAVDEVICE_VERSION_MINOR 2
26 #define LIBAVDEVICE_VERSION_MICRO 1 26 #define LIBAVDEVICE_VERSION_MICRO 2
27 27
28 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ 28 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
29 LIBAVDEVICE_VERSION_MINOR, \ 29 LIBAVDEVICE_VERSION_MINOR, \
30 LIBAVDEVICE_VERSION_MICRO) 30 LIBAVDEVICE_VERSION_MICRO)
31 #define LIBAVDEVICE_VERSION AV_VERSION(LIBAVDEVICE_VERSION_MAJOR, \ 31 #define LIBAVDEVICE_VERSION AV_VERSION(LIBAVDEVICE_VERSION_MAJOR, \
32 LIBAVDEVICE_VERSION_MINOR, \ 32 LIBAVDEVICE_VERSION_MINOR, \
33 LIBAVDEVICE_VERSION_MICRO) 33 LIBAVDEVICE_VERSION_MICRO)
34 #define LIBAVDEVICE_BUILD LIBAVDEVICE_VERSION_INT 34 #define LIBAVDEVICE_BUILD LIBAVDEVICE_VERSION_INT
35 35
36 /** 36 /**
(...skipping 12 matching lines...) Expand all
49 const char *avdevice_license(void); 49 const char *avdevice_license(void);
50 50
51 /** 51 /**
52 * Initialize libavdevice and register all the input and output devices. 52 * Initialize libavdevice and register all the input and output devices.
53 * @warning This function is not thread safe. 53 * @warning This function is not thread safe.
54 */ 54 */
55 void avdevice_register_all(void); 55 void avdevice_register_all(void);
56 56
57 #endif /* AVDEVICE_AVDEVICE_H */ 57 #endif /* AVDEVICE_AVDEVICE_H */
58 58
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavdevice/alsa-audio.h ('k') | source/patched-ffmpeg-mt/libavdevice/oss_audio.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698