mirror of https://git.ffmpeg.org/ffmpeg.git
Merge remote-tracking branch 'qatar/master'
* qatar/master: lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width(). Conflicts: doc/APIchanges libavcodec/utils.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
commit
eef74b2e97
|
|
@ -15,6 +15,11 @@ libavutil: 2012-10-22
|
|||
|
||||
API changes, most recent first:
|
||||
|
||||
2014-01-xx - xxxxxxx - lavc 55.32.1 - avcodec.h
|
||||
Edges are not required anymore on video buffers allocated by get_buffer2()
|
||||
(i.e. as if the CODEC_FLAG_EMU_EDGE flag was always on). Deprecate
|
||||
CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().
|
||||
|
||||
2014-01-19 - xxxxxxx - lavf 55.25.100 - avformat.h
|
||||
Add avformat_get_mov_video_tags() and avformat_get_mov_audio_tags().
|
||||
|
||||
|
|
|
|||
|
|
@ -729,7 +729,13 @@ typedef struct RcOverride{
|
|||
#define CODEC_FLAG_PASS1 0x0200 ///< Use internal 2pass ratecontrol in first pass mode.
|
||||
#define CODEC_FLAG_PASS2 0x0400 ///< Use internal 2pass ratecontrol in second pass mode.
|
||||
#define CODEC_FLAG_GRAY 0x2000 ///< Only decode/encode grayscale.
|
||||
#define CODEC_FLAG_EMU_EDGE 0x4000 ///< Don't draw edges.
|
||||
#if FF_API_EMU_EDGE
|
||||
/**
|
||||
* @deprecated edges are not used/required anymore. I.e. this flag is now always
|
||||
* set.
|
||||
*/
|
||||
#define CODEC_FLAG_EMU_EDGE 0x4000
|
||||
#endif
|
||||
#define CODEC_FLAG_PSNR 0x8000 ///< error[?] variables will be set during encoding.
|
||||
#define CODEC_FLAG_TRUNCATED 0x00010000 /** Input bitstream might be truncated at a random
|
||||
location instead of only at frame boundaries. */
|
||||
|
|
@ -2152,9 +2158,6 @@ typedef struct AVCodecContext {
|
|||
* If AV_GET_BUFFER_FLAG_REF is set in flags then the frame may be reused
|
||||
* (read and/or written to if it is writable) later by libavcodec.
|
||||
*
|
||||
* If CODEC_FLAG_EMU_EDGE is not set in s->flags, the buffer must contain an
|
||||
* edge of the size returned by avcodec_get_edge_width() on all sides.
|
||||
*
|
||||
* avcodec_align_dimensions2() should be used to find the required width and
|
||||
* height, as they normally need to be rounded up to the next multiple of 16.
|
||||
*
|
||||
|
|
@ -3738,14 +3741,20 @@ attribute_deprecated int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame
|
|||
*/
|
||||
int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *frame, int flags);
|
||||
|
||||
#if FF_API_EMU_EDGE
|
||||
/**
|
||||
* Return the amount of padding in pixels which the get_buffer callback must
|
||||
* provide around the edge of the image for codecs which do not have the
|
||||
* CODEC_FLAG_EMU_EDGE flag.
|
||||
*
|
||||
* @return Required padding in pixels.
|
||||
*
|
||||
* @deprecated CODEC_FLAG_EMU_EDGE is deprecated, so this function is no longer
|
||||
* needed
|
||||
*/
|
||||
attribute_deprecated
|
||||
unsigned avcodec_get_edge_width(void);
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Modify width and height values so that they will result in a memory
|
||||
|
|
@ -3753,8 +3762,6 @@ unsigned avcodec_get_edge_width(void);
|
|||
* padding.
|
||||
*
|
||||
* May only be used if a codec with CODEC_CAP_DR1 has been opened.
|
||||
* If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
|
||||
* according to avcodec_get_edge_width() before.
|
||||
*/
|
||||
void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
|
||||
|
||||
|
|
@ -3764,8 +3771,6 @@ void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
|
|||
* line sizes are a multiple of the respective linesize_align[i].
|
||||
*
|
||||
* May only be used if a codec with CODEC_CAP_DR1 has been opened.
|
||||
* If CODEC_FLAG_EMU_EDGE is not set, the dimensions must have been increased
|
||||
* according to avcodec_get_edge_width() before.
|
||||
*/
|
||||
void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
|
||||
int linesize_align[AV_NUM_DATA_POINTERS]);
|
||||
|
|
|
|||
|
|
@ -222,10 +222,12 @@ av_cold void avcodec_register(AVCodec *codec)
|
|||
codec->init_static_data(codec);
|
||||
}
|
||||
|
||||
#if FF_API_EMU_EDGE
|
||||
unsigned avcodec_get_edge_width(void)
|
||||
{
|
||||
return EDGE_WIDTH;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if FF_API_SET_DIMENSIONS
|
||||
void avcodec_set_dimensions(AVCodecContext *s, int width, int height)
|
||||
|
|
@ -1491,6 +1493,11 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
#if FF_API_EMU_EDGE
|
||||
/* force the emu edge flag on, since it's now always active */
|
||||
avctx->flags |= CODEC_FLAG_EMU_EDGE;
|
||||
#endif
|
||||
}
|
||||
end:
|
||||
ff_unlock_avcodec();
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#define LIBAVCODEC_VERSION_MAJOR 55
|
||||
#define LIBAVCODEC_VERSION_MINOR 48
|
||||
#define LIBAVCODEC_VERSION_MICRO 101
|
||||
#define LIBAVCODEC_VERSION_MICRO 102
|
||||
|
||||
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
||||
LIBAVCODEC_VERSION_MINOR, \
|
||||
|
|
@ -138,5 +138,8 @@
|
|||
#ifndef FF_API_NEG_LINESIZES
|
||||
#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 56)
|
||||
#endif
|
||||
#ifndef FF_API_EMU_EDGE
|
||||
#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 56)
|
||||
#endif
|
||||
|
||||
#endif /* AVCODEC_VERSION_H */
|
||||
|
|
|
|||
Loading…
Reference in New Issue