1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavformat
Michael Niedermayer 25b9eef410 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  cljr: K&R cosmetics
  cljr: return a more sensible value when encountering invalid headers
  cljr: drop unnecessary emms_c() calls without MMX code
  cljr: remove useless casts
  cljr: group encode/decode parts under single ifdefs
  cljr: remove stray semicolon
  cljr: add missing return statement in decode_end()
  doc: add pulseaudio to the input list
  avconv: remove unsubstantiated comment
  shorten: avoid abort() on unknown audio types
  cljr: add encoder
  build: merge lists of HTML documentation targets
  tests/examples: Mark some variables only used within their files as static.
  tests/tools/examples: Replace direct exit() calls by return.
  x86 cpuid: set vendor union members separately
  cljr: release picture at end of decoding
  rv40: NEON optimised rv40 qpel motion compensation

Conflicts:
	doc/examples/muxing.c
	libavcodec/cljr.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-09 00:05:51 +01:00
..
2011-11-30 20:34:45 +01:00
2011-12-04 16:44:20 +01:00
2011-11-05 16:51:25 +01:00
2011-11-30 20:34:45 +01:00
2011-08-01 00:58:49 +02:00
2011-08-22 09:35:58 +02:00
2011-08-09 19:56:25 +02:00
2011-11-30 20:34:45 +01:00
2011-12-07 15:29:26 +01:00
2011-12-04 16:44:20 +01:00
2011-11-03 20:21:01 +01:00
2011-12-07 03:19:42 +01:00
2011-12-04 16:44:20 +01:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-12-06 17:42:10 +01:00
2011-08-09 19:56:25 +02:00
2011-10-13 16:50:20 +02:00
2011-12-01 15:32:20 +00:00
2011-11-30 17:39:32 +02:00
2011-10-17 16:51:48 +02:00
2011-11-30 20:34:45 +01:00