diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-19 14:55:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-19 14:55:58 +0200 |
| commit | c9fe864472a2c55c7c4189ff6fb490bec8bd92b3 (patch) | |
| tree | e6b713039096a079b01f66237e8516bdee893f2d /libavcodec/pthread.c | |
| parent | 5980e57cf9a08ca284bc1b5ffba2363f9eff8ca8 (diff) | |
| parent | 4855022aa11ec7aa1a3bd9797814e84795634abe (diff) | |
| download | ffmpeg-c9fe864472a2c55c7c4189ff6fb490bec8bd92b3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vorbisdec: remove some pointless comments
avprobe: add const to AVCodec pointer
libavformat: add const to AVCodec pointers
pthread: add const to AVCodec pointers
Conflicts:
ffprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pthread.c')
| -rw-r--r-- | libavcodec/pthread.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index d7ff5f6dec..5123d1da27 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -364,7 +364,7 @@ static attribute_align_arg void *frame_worker_thread(void *arg) PerThreadContext *p = arg; FrameThreadContext *fctx = p->parent; AVCodecContext *avctx = p->avctx; - AVCodec *codec = avctx->codec; + const AVCodec *codec = avctx->codec; pthread_mutex_lock(&p->mutex); while (1) { @@ -528,7 +528,7 @@ static int submit_packet(PerThreadContext *p, AVPacket *avpkt) { FrameThreadContext *fctx = p->parent; PerThreadContext *prev_thread = fctx->prev_thread; - AVCodec *codec = p->avctx->codec; + const AVCodec *codec = p->avctx->codec; uint8_t *buf = p->avpkt.data; if (!avpkt->size && !(codec->capabilities & CODEC_CAP_DELAY)) return 0; @@ -736,7 +736,7 @@ static void park_frame_worker_threads(FrameThreadContext *fctx, int thread_count static void frame_thread_free(AVCodecContext *avctx, int thread_count) { FrameThreadContext *fctx = avctx->thread_opaque; - AVCodec *codec = avctx->codec; + const AVCodec *codec = avctx->codec; int i; park_frame_worker_threads(fctx, thread_count); @@ -794,7 +794,7 @@ static void frame_thread_free(AVCodecContext *avctx, int thread_count) static int frame_thread_init(AVCodecContext *avctx) { int thread_count = avctx->thread_count; - AVCodec *codec = avctx->codec; + const AVCodec *codec = avctx->codec; AVCodecContext *src = avctx; FrameThreadContext *fctx; int i, err = 0; |