Files
ffmpeg/libavformat
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
..
2011-05-15 03:25:57 +02:00
2011-06-21 05:27:44 +02:00
2011-04-17 23:43:54 +02:00
2011-06-16 06:29:01 +02:00
2011-04-07 03:32:26 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-06-21 05:27:44 +02:00
2011-06-21 05:27:44 +02:00
2011-06-16 06:29:01 +02:00
2011-06-16 06:29:01 +02:00
2011-06-16 06:29:01 +02:00
2011-04-09 03:17:07 +02:00
2011-06-16 06:29:01 +02:00
2011-04-10 03:32:29 +02:00
2011-04-09 03:17:07 +02:00
2011-05-15 19:18:02 +02:00
2011-04-18 18:23:16 +02:00
2011-04-21 03:37:05 +02:00
2011-04-09 03:17:07 +02:00
2011-04-17 23:43:54 +02:00
2011-06-16 06:29:01 +02:00
2011-06-16 06:29:01 +02:00
2011-06-16 06:29:01 +02:00
2011-06-17 11:02:12 +02:00
2011-06-16 06:29:01 +02:00
2011-04-07 03:32:26 +02:00
2011-04-20 04:48:23 +02:00
2011-04-07 03:32:26 +02:00
2011-06-16 06:29:01 +02:00
2011-04-20 04:48:23 +02:00
2011-06-16 06:29:01 +02:00
2011-06-16 06:29:01 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-06-21 05:27:44 +02:00
2011-06-16 06:29:01 +02:00
2011-06-21 05:27:44 +02:00
2011-06-16 06:29:01 +02:00
2011-06-13 18:30:55 +02:00
2011-06-16 06:29:01 +02:00
2011-06-03 21:14:30 +02:00
2011-06-16 06:29:01 +02:00
2011-06-02 20:06:00 +01:00
2011-06-21 05:27:44 +02:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-06-16 06:29:01 +02:00
2011-04-24 03:41:22 +02:00
2011-04-24 03:41:22 +02:00
2011-05-10 04:03:17 +02:00
2011-06-21 05:27:44 +02:00
2011-06-21 05:27:44 +02:00
2011-04-20 04:48:23 +02:00
2011-04-02 01:54:27 +02:00
2011-06-02 20:06:00 +01:00
2011-06-16 06:29:01 +02:00
2011-06-16 06:29:01 +02:00
2011-06-21 05:27:44 +02:00
2011-06-21 05:27:44 +02:00
2011-04-04 02:15:12 +02:00
2011-06-13 20:47:06 +02:00
2011-05-01 21:13:18 +02:00
2011-06-02 20:06:00 +01:00