Unified · Split
| @@ -15,6 +15,10 @@ libavutil: 2012-10-22 · 14 unmodified lines | |||
| 15 | 15 | ||
| 16 | API changes, most recent first: | 16 | API changes, most recent first: |
| 17 | 17 | ||
| 18 | 2013-07-XX - xxxxxxx - XXXXXXXXXXXXXX - avcodec.h | ||
| 19 | Add avcodec_chroma_pos_to_enum() | ||
| 20 | Add avcodec_enum_to_chroma_pos() | ||
| 21 | |||
| 18 | 2013-07-03 - xxxxxxx - lavfi 3.78.100 - avfilter.h | 22 | 2013-07-03 - xxxxxxx - lavfi 3.78.100 - avfilter.h |
| 19 | Deprecate avfilter_graph_parse() in favor of the equivalent | 23 | Deprecate avfilter_graph_parse() in favor of the equivalent |
| 20 | avfilter_graph_parse_ptr(). | 24 | avfilter_graph_parse_ptr(). |
| @@ -3617,6 +3617,17 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, · 3616 unmodified lines | |||
| 3617 | */ | 3617 | */ |
| 3618 | int avcodec_enum_to_chroma_pos(int *xpos, int *ypos, enum AVChromaLocation pos); | 3618 | int avcodec_enum_to_chroma_pos(int *xpos, int *ypos, enum AVChromaLocation pos); |
| 3619 | 3619 | ||
| 3620 | /** | ||
| 3621 | * Converts swscale x/y chroma position to AVChromaLocation. | ||
| 3622 | * | ||
| 3623 | * The positions represent the chroma (0,0) position in a coordinates system | ||
| 3624 | * with luma (0,0) representing the origin and luma(1,1) representing 256,256 | ||
| 3625 | * | ||
| 3626 | * @param xpos horizontal chroma sample position | ||
| 3627 | * @param ypos vertical chroma sample position | ||
| 3628 | */ | ||
| 3629 | enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos); | ||
| 3630 | |||
| 3620 | #if FF_API_OLD_DECODE_AUDIO | 3631 | #if FF_API_OLD_DECODE_AUDIO |
| 3621 | /** | 3632 | /** |
| 3622 | * Wrapper function which calls avcodec_decode_audio4. | 3633 | * Wrapper function which calls avcodec_decode_audio4. |
| @@ -350,6 +350,17 @@ int avcodec_enum_to_chroma_pos(int *xpos, int *ypos, enum AVChromaLocation pos) · 349 unmodified lines | |||
| 350 | return 0; | 350 | return 0; |
| 351 | } | 351 | } |
| 352 | 352 | ||
| 353 | enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos) | ||
| 354 | { | ||
| 355 | int pos, xout, yout; | ||
| 356 | |||
| 357 | for (pos = AVCHROMA_LOC_UNSPECIFIED + 1; pos < AVCHROMA_LOC_NB; pos++) { | ||
| 358 | if (avcodec_enum_to_chroma_pos(&xout, &yout, pos) == 0 && xout == xpos && yout == ypos) | ||
| 359 | return pos; | ||
| 360 | } | ||
| 361 | return AVCHROMA_LOC_UNSPECIFIED; | ||
| 362 | } | ||
| 363 | |||
| 353 | int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels, | 364 | int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels, |
| 354 | enum AVSampleFormat sample_fmt, const uint8_t *buf, | 365 | enum AVSampleFormat sample_fmt, const uint8_t *buf, |
| 355 | int buf_size, int align) | 366 | int buf_size, int align) |
| @@ -29,8 +29,8 @@ · 28 unmodified lines | |||
| 29 | #include "libavutil/avutil.h" | 29 | #include "libavutil/avutil.h" |
| 30 | 30 | ||
| 31 | #define LIBAVCODEC_VERSION_MAJOR 55 | 31 | #define LIBAVCODEC_VERSION_MAJOR 55 |
| 32 | #define LIBAVCODEC_VERSION_MINOR 18 | 32 | #define LIBAVCODEC_VERSION_MINOR 19 |
| 33 | #define LIBAVCODEC_VERSION_MICRO 102 | 33 | #define LIBAVCODEC_VERSION_MICRO 100 |
| 34 | 34 | ||
| 35 | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ | 35 | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
| 36 | LIBAVCODEC_VERSION_MINOR, \ | 36 | LIBAVCODEC_VERSION_MINOR, \ |