Michael Niedermayer 0cb233cf46
Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' ...
* commit 'b2c087871dafc7d030b2d48457ddff597dfd4925':
Move x86util.asm from libavcodec/ to libavutil/.
Move x86inc.asm to libavutil/.
APIchanges: note error_recognition in lavf
lavf: add support for error_recognition, use it in avidec, and bump minor API version
avconv: change semantics of -map
avconv: get rid of new* options.
cmdutils: allow precisely specifying a stream for AVOptions.
configure: add missing CFLAGS to fix building on the HURD
libx264: Include hint for possible values for configuring libx264
cmdutils: allow ':'-separated modifiers in option names.
avconv: make -map_metadata work consistently with the other options
avconv: remove deprecated options.
avconv: make -map_chapters accept only the input file index.
Make a copy of ffmpeg under a new name -- avconv.
ffmpeg: add a warning stating that the program is deprecated.
Add weighted motion compensation for RV40 B-frames
RV3/4: calculate B-frame motion weights once per frame
Move RV3/4-specific DSP functions into their own context
mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt
h264: notice memory allocation failure
Conflicts:
.gitignore
Makefile
cmdutils.c
configure
doc/ffplay.texi
doc/ffprobe.texi
doc/ffserver.texi
libavcodec/libx264.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/version.h
tests/lavf-regression.sh
tests/lavfi-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-08-13 02:56:08 +02:00
2011-07-22 12:08:52 +02:00
2011-08-10 16:00:32 +02:00
2011-07-22 12:08:52 +02:00
2011-07-22 12:08:52 +02:00
2011-07-28 09:28:01 +02:00
2011-07-22 12:08:52 +02:00
2011-07-22 12:08:52 +02:00
2011-07-22 12:08:52 +02:00
2011-08-13 02:56:08 +02:00
2011-07-30 06:46:08 +02:00
2011-08-04 01:40:29 +02:00
2011-08-10 16:29:51 +02:00
2011-07-30 06:46:08 +02:00
2011-07-16 19:43:35 +02:00
2011-07-30 06:46:08 +02:00
2011-08-12 17:20:57 +02:00
2011-08-13 01:13:41 +02:00
2011-08-13 01:13:41 +02:00
2011-07-30 06:46:08 +02:00
2011-08-12 17:20:57 +02:00
2011-08-11 11:33:32 -04:00
2011-08-10 17:09:24 -04:00
2011-08-11 20:39:20 +02:00
2011-08-12 17:20:57 +02:00
2011-07-21 16:28:53 +02:00
2011-07-21 16:28:53 +02:00
2011-07-21 16:28:53 +02:00
2011-08-03 11:45:33 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-08-12 17:20:57 +02:00
2011-07-30 06:46:08 +02:00
2011-07-21 16:28:53 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-08-11 20:39:20 +02:00
2011-07-30 06:46:08 +02:00
2011-08-02 22:12:18 +02:00
2011-07-30 06:46:08 +02:00
2011-07-28 09:28:01 +02:00
2011-07-28 09:28:01 +02:00
2011-07-27 16:05:49 +01:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-11 20:39:20 +02:00
2011-07-30 06:46:08 +02:00
2011-07-21 16:28:53 +02:00
2011-07-30 06:46:08 +02:00
2011-08-04 01:40:29 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-22 12:08:52 +02:00
2011-07-27 10:40:34 +02:00
2011-07-30 06:46:08 +02:00
2011-07-22 12:08:52 +02:00
2011-07-22 12:08:52 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-22 12:08:52 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-22 12:08:52 +02:00
2011-08-13 02:56:08 +02:00
2011-08-13 02:56:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-08-03 20:09:53 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-20 18:31:45 +02:00
2011-07-20 18:31:45 +02:00
2011-07-20 18:31:45 +02:00
2011-08-09 16:44:34 -04:00
2011-07-19 14:15:00 -04:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-23 16:47:10 +02:00
2011-07-16 19:43:35 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-08-04 20:59:36 +02:00
2011-07-29 01:50:53 +02:00
2011-08-10 16:29:51 +02:00
2011-08-13 02:56:08 +02:00
2011-07-20 18:31:45 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-28 10:27:51 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-21 18:10:58 +01:00
2011-07-21 18:10:58 +01:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-16 19:43:35 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-08-13 02:56:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-21 16:28:53 +02:00
2011-07-19 18:46:04 +02:00
2011-07-30 06:46:08 +02:00
2011-08-12 17:20:57 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-08-13 02:56:08 +02:00
2011-08-13 02:56:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-18 20:00:24 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-08-01 21:06:48 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-08-10 16:00:32 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-28 09:28:01 +02:00
2011-08-10 16:00:32 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-08-13 02:56:08 +02:00
2011-07-29 08:42:34 +02:00
2011-07-30 06:46:08 +02:00
2011-08-13 01:06:15 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-08-09 15:08:20 +02:00
2011-08-01 01:26:55 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-08-09 16:32:39 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-08-09 16:32:39 +02:00
2011-08-13 02:56:08 +02:00
2011-08-13 02:56:08 +02:00
2011-08-13 02:56:08 +02:00
2011-08-11 16:07:58 -07:00
2011-08-09 16:32:39 +02:00
2011-08-13 02:56:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-21 12:49:51 +01:00
2011-07-21 16:28:53 +02:00
2011-07-21 16:28:53 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-16 19:43:35 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-08-10 16:00:32 +02:00
2011-08-10 16:00:32 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-08-04 01:40:29 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-08-10 16:57:33 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-16 19:43:35 +02:00
2011-07-30 06:46:08 +02:00
2011-07-21 16:28:53 +02:00
2011-07-16 19:43:35 +02:00
2011-07-17 20:12:02 +02:00
2011-07-30 06:46:08 +02:00
2011-08-04 01:40:29 +02:00
2011-08-10 16:29:51 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-08-04 01:40:29 +02:00
2011-08-04 01:40:29 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
2011-07-30 06:46:08 +02:00
Michael Niedermayer
0cb233cf46