Michael Niedermayer 779d7610c7 Merge branch 'master' into oldabi ...

* master: (109 commits)
  libx264: fix open gop default. Please use -x264opts to force open gop This fixes Ticket268
  avfilter picture pool: double free hotfix
  mpegaudio_parser: be less picky on the start position
  ppc32: Fix movrel
  Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().
  x86: cabac: fix register constraints for 32-bit mode
  cabac: move x86 asm to libavcodec/x86/cabac.h
  x86: h264: cast pointers to intptr_t rather than int
  x86: h264: remove hardcoded edi in decode_significance_8x8_x86()
  x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86()
  x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86()
  x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86()
  x86: cabac: change 'a' constraint to 'r' in get_cabac_inline()
  x86: cabac: remove hardcoded esi in get_cabac_inline()
  x86: cabac: remove hardcoded edx in get_cabac_inline()
  x86: cabac: remove unused macro parameter
  x86: cabac: remove hardcoded ebx in inline asm
  x86: cabac: remove hardcoded struct offsets from inline asm
  cabac: remove inline asm under #if 0
  cabac: remove BRANCHLESS_CABAC_DECODER switch
  ...

Conflicts:
	cmdutils.c
	ffserver.c
	libavfilter/avfilter.h
	libavformat/avformat.h
	libavformat/utils.c
	libavformat/version.h
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2011-06-21 05:27:44 +02:00

..

libmpcodecs

Port remove of get_sws_cpuflags from MPlayer's libmpcodecs.

2011-06-02 08:38:09 +02:00

x86

Add some forgotten const to function arguments in libavfilter & libavformat.

2011-05-17 03:05:36 +02:00

af_anull.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

allfilters.c

lavfi: add vsink_buffer, and use it in ff* tools

2011-06-19 19:18:33 +02:00

asink_anullsink.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

asrc_anullsrc.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

avcodec.c

libavfilter: implement avfilter_fill_frame_from_video_buffer_ref()

2011-06-12 22:46:02 +02:00

avcodec.h

libavfilter: implement avfilter_fill_frame_from_video_buffer_ref()

2011-06-12 22:46:02 +02:00

avfilter.c

avfilter picture pool: double free hotfix

2011-06-21 04:24:03 +02:00

avfilter.h

Merge branch 'master' into oldabi

2011-06-21 05:27:44 +02:00

avfiltergraph.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

avfiltergraph.h

avfiltergraph: make the AVFilterInOut alloc/free API public

2011-06-12 22:46:02 +02:00

defaults.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

drawutils.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

drawutils.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

formats.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

gradfun.h

Add some forgotten const to function arguments in libavfilter & libavformat.

2011-05-17 03:05:36 +02:00

graphparser.c

graphparser: add missing NULL check in avfilter_graph_parse()

2011-06-18 02:08:38 +02:00

internal.h

lavfi: apply misc style fixes

2011-06-02 18:24:49 +02:00

libavfilter.v

Add symbol versioning for shared libraries

2010-01-16 04:49:02 +00:00

Makefile

lavfi: fix Makefile HEADERS

2011-06-19 22:58:31 +02:00

vf_aspect.c

lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratio

2011-05-01 13:10:18 +02:00

vf_blackframe.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_copy.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_crop.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_cropdetect.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_drawbox.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_drawtext.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_fade.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_fieldorder.c

Remove unused variables

2011-06-02 20:06:00 +01:00

vf_fifo.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_format.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_frei0r.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_gradfun.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_hflip.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_hqdn3d.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_libopencv.c

Merge branch 'master' into oldabi

2011-06-21 05:27:44 +02:00

vf_lut.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_mp.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_null.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_overlay.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_pad.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_pixdesctest.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_scale.c

Fix type of out[] variable, it should not be const.

2011-06-01 20:26:54 +02:00

vf_select.c

lavfi: add select filter

2011-05-25 12:54:07 +02:00

vf_setpts.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_settb.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_showinfo.c

showinfo: replace "CRC" by "checksum"

2011-05-15 12:28:53 +02:00

vf_slicify.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_split.c

vf_split: give more meaningful names to the output pads

2011-05-22 02:43:47 +02:00

vf_transpose.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_unsharp.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_vflip.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_yadif.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vsink_buffer.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vsink_buffer.h

lavfi: add vsink_buffer, and use it in ff* tools

2011-06-19 19:18:33 +02:00

vsink_nullsink.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vsrc_buffer.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vsrc_buffer.h

vsrc_buffer: add flags param to av_vsrc_buffer_add_video_buffer_ref

2011-06-06 01:35:27 +02:00

vsrc_color.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vsrc_movie.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vsrc_nullsrc.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

yadif.h

Change yadif to not use out of picture lines.

2011-04-03 08:46:19 +02:00