diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-27 02:42:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-27 02:42:30 +0200 |
| commit | 01831fd004908f9dbc3777400169505a63a7adef (patch) | |
| tree | 26be552bd1dced251a55dbcf81d3fb95f30e4273 /libavcodec/avcodec.h | |
| parent | eb1ac04e59cbba7743c10dd5854b6efdfb6a2ebe (diff) | |
| parent | 1c80c9d7ef809180042257200c7b5f6b81d0b0e2 (diff) | |
| download | ffmpeg-01831fd004908f9dbc3777400169505a63a7adef.tar.gz | |
Merge commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2'
* commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2':
hwaccel: Call ->get_format again if hwaccel init fails
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index e14abd22df..94e82f73f9 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1480,6 +1480,10 @@ typedef struct AVCodecContext { * @param fmt is the list of formats which are supported by the codec, * it is terminated by -1 as 0 is a valid format, the formats are ordered by quality. * The first is always the native one. + * @note The callback may be called again immediately if initialization for + * the selected (hardware-accelerated) pixel format failed. + * @warning Behavior is undefined if the callback returns a value not + * in the fmt list of formats. * @return the chosen format * - encoding: unused * - decoding: Set by user, if not set the native format will be chosen. |