diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-29 04:29:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-29 04:29:21 +0200 |
| commit | 455ce979d0793096662d139e996107a527617832 (patch) | |
| tree | 0d3fb5dba727b7f07222c26ac333034a224898be /libswscale | |
| parent | f0f3425311ea88cf4ff24fffea0b679f54508c1c (diff) | |
| parent | 5b81e295931bad4dac0af29333b4e2a203b3f4d4 (diff) | |
| download | ffmpeg-455ce979d0793096662d139e996107a527617832.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
LOTS of duplicates ...
avio: Fix the deprecated fallback URL-prefixed open flags
avoid duplicate -lm in .pc files
mpeg12: terminate mpeg2_video_profiles arrays
network: Check POLLERR and POLLHUP in ff_network_wait_fd
mpegtsenc: make PMT PID really start on pmt_start_pid
nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
rawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
hflip: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
crop: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation
Conflicts:
configure
libswscale/swscale.h
tests/ref/lavf/ts
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/swscale.h b/libswscale/swscale.h index aa12e08ae4..406eec47f2 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBSWSCALE_VERSION_MAJOR 0 -#define LIBSWSCALE_VERSION_MINOR 13 +#define LIBSWSCALE_VERSION_MINOR 14 #define LIBSWSCALE_VERSION_MICRO 0 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ |