diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-16 01:36:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-16 01:36:49 +0100 |
| commit | 4257ce112c41f741408b817d305630dadc3ee52d (patch) | |
| tree | 7121a52130f9b73dd4a2cdbae2d71d50918a39d5 /libavcodec | |
| parent | c743aad557fe14980b9912869d90008ecb29ba97 (diff) | |
| parent | 702985b8b7bfe0d8eac2747f3a03e7f15886364c (diff) | |
| download | ffmpeg-4257ce112c41f741408b817d305630dadc3ee52d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dxa: remove useless code
lavf: don't select an attached picture as default stream for seeking.
avconv: remove pointless checks.
avconv: check for get_filtered_frame() failure.
avconv: remove a pointless check.
swscale: convert hscale() to use named arguments.
x86inc: add *mp named argument support to DEFINE_ARGS.
swscale: convert hscale to cpuflags().
Conflicts:
ffmpeg.c
libswscale/x86/scale.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dxa.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c index 28c6af9031..1b683fda22 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -36,7 +36,6 @@ * Decoder context */ typedef struct DxaDecContext { - AVCodecContext *avctx; AVFrame pic, prev; int dsize; @@ -292,7 +291,6 @@ static av_cold int decode_init(AVCodecContext *avctx) { DxaDecContext * const c = avctx->priv_data; - c->avctx = avctx; avctx->pix_fmt = PIX_FMT_PAL8; avcodec_get_frame_defaults(&c->pic); |