virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4'

Browse Source 
* commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4':
  display: add matrix flip api

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-09 23:57:20 +02:00
commit c67690f854
4 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -15,6 +15,9 @@ libavutil: 2012-10-22
API changes, most recent first: API changes, most recent first:
2014-07-xx - xxxxxxx - lavu 53.18.0 - display.h
Add av_display_matrix_flip() to flip the transformation matrix.
2014-07-xx - xxxxxxx - lavc 55.56.0 - dv_profile.h 2014-07-xx - xxxxxxx - lavc 55.56.0 - dv_profile.h
Add a public API for DV profile handling. Add a public API for DV profile handling.

10
libavutil/display.c
View File

@ -61,3 +61,13 @@ void av_display_rotation_set(int32_t matrix[9], double angle)
matrix[4] = CONV_DB(c); matrix[4] = CONV_DB(c);
matrix[8] = 1 << 30; matrix[8] = 1 << 30;
} }
void av_display_matrix_flip(int32_t matrix[9], int hflip, int vflip)
{
int i;
const int flip[] = { 1 - 2 * (!!hflip), 1 - 2 * (!!vflip), 1 };
if (hflip || vflip)
for (i = 0; i < 9; i++)
matrix[i] *= flip[i % 3];
}

9
libavutil/display.h
View File

@ -74,4 +74,13 @@ double av_display_rotation_get(const int32_t matrix[9]);
*/ */
void av_display_rotation_set(int32_t matrix[9], double angle); void av_display_rotation_set(int32_t matrix[9], double angle);
/**
* Flip the input matrix horizontally and/or vertically.
*
* @param matrix an allocated transformation matrix
* @param hflip whether the matrix should be flipped horizontally
* @param vflip whether the matrix should be flipped vertically
*/
void av_display_matrix_flip(int32_t matrix[9], int hflip, int vflip);
#endif /* AVUTIL_DISPLAY_H */ #endif /* AVUTIL_DISPLAY_H */

2
libavutil/version.h
View File

@ -56,7 +56,7 @@
*/ */
#define LIBAVUTIL_VERSION_MAJOR 52 #define LIBAVUTIL_VERSION_MAJOR 52
#define LIBAVUTIL_VERSION_MINOR 91 #define LIBAVUTIL_VERSION_MINOR 92
#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \