diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 23:21:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 23:21:37 +0100 |
| commit | 3ba0bfe71fb18e955ca0110e5a65105d84932fbc (patch) | |
| tree | b308d41d170483c23c31c87d8dcb19fc169e2eb6 /libavformat | |
| parent | 36be045ed7942e07742c3cf3d3012b1d2a9ec344 (diff) | |
| parent | a99273ebf328658c183c2d267f1c2b8bfac58bb3 (diff) | |
| download | ffmpeg-3ba0bfe71fb18e955ca0110e5a65105d84932fbc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ulti: Fix invalid reads
lavf: dealloc private options in av_write_trailer
yadif: support 10bit YUV
vc1: mark with ER_MB_ERROR bits overconsumption
lavc: introduce ER_MB_END and ER_MB_ERROR
error_resilience: use the ER_ namespace
build: move inclusion of subdir.mak to main subdir loop
rv34: NEON optimised 4x4 dequant
rv34: move 4x4 dequant to RV34DSPContext
aacdec: Use intfloat.h rather than local punning union.
Conflicts:
libavcodec/h264.c
libavcodec/vc1dec.c
libavfilter/vf_yadif.c
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index ca66a39677..5ff45f7509 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -369,5 +369,3 @@ OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o TESTPROGS = seek TOOLS = pktdumper probetest - -include $(SRC_PATH)/subdir.mak diff --git a/libavformat/utils.c b/libavformat/utils.c index ca93eda666..d84749699a 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3504,7 +3504,7 @@ fail: av_freep(&s->streams[i]->priv_data); av_freep(&s->streams[i]->index_entries); } - if (s->iformat && s->iformat->priv_class) + if (s->oformat->priv_class) av_opt_free(s->priv_data); av_freep(&s->priv_data); return ret; |