diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-29 02:46:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-29 02:46:11 +0200 |
| commit | 59bf303d6806e1ab0fa415f5313131c9ca7aedb7 (patch) | |
| tree | 10a2e9e17a6d4a0e499e8236da4acf49d95445aa /libavdevice | |
| parent | 7dfd58ef495f2724cca40cd4a59b1d0c4d81aa28 (diff) | |
| parent | c4549bd66a94bec1284dcca0da19e5038a82cbe3 (diff) | |
| download | ffmpeg-59bf303d6806e1ab0fa415f5313131c9ca7aedb7.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
ac3enc: avoid memcpy() of exponents and baps in EXP_REUSE case by using exponent reference blocks.
Chronomaster DFA decoder
DUPLICATE: framebuffer device demuxer
NOT MERGED: cosmetics: fix dashed line length after 070c5d0
http: header field names are case insensitive
Conflicts:
LICENSE
README
doc/indevs.texi
libavdevice/fbdev.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/avdevice.h | 2 | ||||
| -rw-r--r-- | libavdevice/fbdev.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index 23e3f3132b..0c29c7b975 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -22,7 +22,7 @@ #include "libavutil/avutil.h" #define LIBAVDEVICE_VERSION_MAJOR 52 -#define LIBAVDEVICE_VERSION_MINOR 3 +#define LIBAVDEVICE_VERSION_MINOR 4 #define LIBAVDEVICE_VERSION_MICRO 0 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ diff --git a/libavdevice/fbdev.c b/libavdevice/fbdev.c index 121f02ccff..4f670e9875 100644 --- a/libavdevice/fbdev.c +++ b/libavdevice/fbdev.c @@ -57,8 +57,7 @@ static struct rgb_pixfmt_map_entry rgb_pixfmt_map[] = { { 24, 16, 8, 0, 0, PIX_FMT_BGR24 }, }; -static enum PixelFormat -get_pixfmt_from_fb_varinfo(struct fb_var_screeninfo *varinfo) +static enum PixelFormat get_pixfmt_from_fb_varinfo(struct fb_var_screeninfo *varinfo) { int i; |