diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-26 01:52:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-26 02:23:56 +0100 |
| commit | 3c5fe5b52758225e58fec917cc29281d6025aa67 (patch) | |
| tree | d7484edfa989ffc33744cbbf11960e803f677f2b /libavfilter | |
| parent | 01e5e97026cf0b344abafca22b0336a2c58b2a33 (diff) | |
| parent | d78bb1a4b2a3a415b68e4e6dd448779eccec64e3 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
wma: Clip WMA1 and WMA2 frame length to 11 bits.
movenc: Don't require frame_size to be set for modes other than mov
doc: Update APIchanges with info on muxer flushing
movenc: Reindent a block
tools: Remove some unnecessary #undefs.
rv20: prevent calling ff_h263_decode_mba() with unset height/width
tools: K&R reformatting cosmetics
Ignore generated aviocat and ismindex tools.
build: Automatically include architecture-specific library Makefile snippets.
indeo5: prevent null pointer dereference on broken files
pktdumper: Use usleep instead of sleep
cosmetics: Remove some unnecessary block braces.
Drop unnecessary prefix from *sink* variable and struct names.
Add a tool for creating smooth streaming manifests
movdec: Calculate an average bit rate for fragmented streams, too
movenc: Write the sample rate instead of time scale in the stsd atom
movenc: Add a separate ismv/isma (smooth streaming) muxer
movenc: Allow the caller to decide on fragmentation
libavformat: Add a flag for muxers that support write_packet(NULL) for flushing
movenc: Add support for writing fragmented mov files
...
Conflicts:
Changelog
cmdutils.c
cmdutils.h
doc/APIchanges
ffmpeg.c
ffplay.c
libavfilter/Makefile
libavformat/Makefile
libavformat/avformat.h
libavformat/movenc.c
libavformat/movenc.h
libavformat/version.h
tools/graph2dot.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/Makefile | 3 | ||||
| -rw-r--r-- | libavfilter/vf_hflip.c | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index b77a20cbef..01a1316434 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -106,7 +106,6 @@ OBJS-$(CONFIG_TESTSRC_FILTER) += vsrc_testsrc.o OBJS-$(CONFIG_BUFFERSINK_FILTER) += sink_buffer.o OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o - OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/mp_image.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/img_format.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_2xsai.o @@ -164,8 +163,6 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yvu9.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o --include $(SRC_PATH)/$(SUBDIR)$(ARCH)/Makefile - DIRS = x86 libmpcodecs TESTPROGS = formats diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c index f1418ca8b6..b249749b78 100644 --- a/libavfilter/vf_hflip.c +++ b/libavfilter/vf_hflip.c @@ -96,10 +96,8 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) for (i = 0; i < h>>vsub; i++) { switch (step) { case 1: - { for (j = 0; j < (inlink->w >> hsub); j++) outrow[j] = inrow[-j]; - } break; case 2: |