1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavcodec
Michael Niedermayer 0b9a69f244 Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  aacdec: Fix PS in ADTS.
  avconv: Consistently use PIX_FMT_NONE.
  dsputil: use cpuflags in x86 emu_edge_core
  dsputil: use movups instead of movdqu in ff_emu_edge_core_sse()
  wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits.
  mov: Remove some redundant and obsolete comments.
  Add libavutil/mathematics.h #includes for INFINITY
  doxy: structure libavformat groups
  doxy: introduce an empty structure in libavcodec
  doxy: provide a start page and document libavutil
  doxy: cleanup pixfmt.h
  regtest: split video encode/decode tests into individual targets
  ARM: add explicit .arch and .fpu directives to asm.S
  pthread: do not touch has_b_frames
  avconv: cleanup the transcoding loop in output_packet().
  avconv: split subtitle transcoding out of output_packet().
  avconv: split video transcoding out of output_packet().
  avconv: split audio transcoding out of output_packet().
  avconv: reindent.
  avconv: move streamcopy-only code out of decoding loop.
  ...

Conflicts:
	avconv.c
	libavcodec/aaccoder.c
	libavcodec/pthread.c
	libavcodec/version.h
	libavutil/audioconvert.h
	libavutil/avutil.h
	libavutil/mem.h
	tests/ref/vsynth1/dv
	tests/ref/vsynth1/mpeg2thread
	tests/ref/vsynth2/dv
	tests/ref/vsynth2/mpeg2thread

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-23 04:02:17 +01:00
..
2011-11-20 14:51:38 +06:00
2011-11-06 09:37:34 +01:00
2011-11-12 20:47:33 +01:00
2011-11-12 19:36:23 +01:00
2011-11-12 19:37:24 +01:00
2011-11-12 20:01:05 +01:00
2011-11-12 20:01:50 +01:00
2011-11-12 20:05:35 +01:00
2011-10-30 21:50:17 +01:00
2011-10-30 21:50:17 +01:00
2011-11-14 18:14:20 +01:00
2011-11-05 00:02:31 +01:00
2011-11-05 00:02:38 +01:00
2011-11-12 20:07:31 +01:00
2011-11-09 23:10:07 +01:00
2011-11-19 04:07:26 +01:00
2011-11-05 15:37:02 +01:00
2011-11-05 15:37:02 +01:00
2011-10-26 14:32:01 +02:00
2011-11-12 21:00:12 +01:00
2011-11-13 15:43:09 +01:00
2011-11-13 03:01:30 +01:00
2011-11-17 21:06:46 +01:00
2011-11-20 14:51:38 +06:00
2011-11-02 02:26:28 +01:00
2011-11-19 04:07:26 +01:00
2011-11-11 18:40:19 +01:00
2011-11-21 16:36:49 +01:00
2011-11-12 20:15:21 +01:00
2011-10-27 14:34:45 +02:00
2011-10-27 15:27:32 +02:00
2011-11-12 20:15:56 +01:00
2011-11-12 20:16:43 +01:00
2011-11-12 20:17:56 +01:00
2011-11-12 20:21:07 +01:00
2011-11-15 00:41:36 +01:00
2011-11-15 00:41:36 +01:00
2011-11-13 15:04:29 +01:00
2011-11-12 20:49:53 +01:00