Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -4756,6 +4756,10 @@ probe_cc(){
_flags_filter=cparser_flags
fi

# Debug:
#_cflags_speed='-O0'
#_cflags_size='-O0'

eval ${pfx}_type=\$_type
eval ${pfx}_ident=\$_ident
}
Expand Down Expand Up @@ -4784,6 +4788,14 @@ cc_ldflags=$_ldflags
set_ccvars CC
set_ccvars CXX

echo "cflags_filter: $cflags_filter"
echo "cflags_speed: $cflags_speed"
echo "cflags_size: $cflags_size"
echo "cflags_noopt: $cflags_noopt"
echo "_flags: $_flags"
echo "cc_ldflags: $_ldflags"


probe_cc hostcc "$host_cc"
host_cflags_filter=$_flags_filter
host_cflags_speed=$_cflags_speed
Expand Down Expand Up @@ -6919,6 +6931,7 @@ if [ -z "$optflags" ]; then
optflags=$cflags_noopt
fi
fi
echo "optflags: $optflags"

check_optflags(){
check_cflags "$@"
Expand Down
7,738 changes: 7,738 additions & 0 deletions configure.debug

Large diffs are not rendered by default.

16 changes: 10 additions & 6 deletions libavcodec/cuviddec.c
Original file line number Diff line number Diff line change
Expand Up @@ -682,21 +682,25 @@ static int cuvid_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
static av_cold int cuvid_decode_end(AVCodecContext *avctx)
{
CuvidContext *ctx = avctx->priv_data;
AVHWDeviceContext *device_ctx = (AVHWDeviceContext *)ctx->hwdevice->data;
AVCUDADeviceContext *device_hwctx = device_ctx->hwctx;
CUcontext dummy, cuda_ctx = device_hwctx->cuda_ctx;

CUcontext dummy;
av_fifo_freep(&ctx->frame_queue);

ctx->cudl->cuCtxPushCurrent(cuda_ctx);
if (ctx->hwdevice) {
AVHWDeviceContext *device_ctx = (AVHWDeviceContext *)ctx->hwdevice->data;
AVCUDADeviceContext *device_hwctx = device_ctx->hwctx;
CUcontext cuda_ctx = device_hwctx->cuda_ctx;

ctx->cudl->cuCtxPushCurrent(cuda_ctx);
}

if (ctx->cuparser)
ctx->cvdl->cuvidDestroyVideoParser(ctx->cuparser);

if (ctx->cudecoder)
ctx->cvdl->cuvidDestroyDecoder(ctx->cudecoder);

ctx->cudl->cuCtxPopCurrent(&dummy);
if (ctx->cudl)
ctx->cudl->cuCtxPopCurrent(&dummy);

ctx->cudl = NULL;

Expand Down
1 change: 1 addition & 0 deletions libavcodec/h2645_parse.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ typedef struct H2645NAL {
* H.264 only, nal_ref_idc
*/
int ref_idc;
int slice_header_len_bits;
} H2645NAL;

typedef struct H2645RBSP {
Expand Down
1 change: 1 addition & 0 deletions libavcodec/h264_parse.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,5 @@ int ff_h264_decode_extradata(const uint8_t *data, int size, H264ParamSets *ps,
*/
int ff_h264_get_profile(const SPS *sps);


#endif /* AVCODEC_H264_PARSE_H */
Loading