Michael Niedermayer
58257ea29e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (28 commits)
mp3enc: write a xing frame containing number of frames in the file
lavf: update AVStream.nb_frames when muxing.
ffmpeg: remove unused variables from InputStream.
doc: update ffmpeg -ar and -ac documentation to reflect reality.
ffmpeg: remove pointless if (nb_input_files)
ffmpeg: merge input_files_ts_offset into input_files.
ffmpeg: merge input_codecs into input_streams.
ffmpeg: drop AV prefixes from struct names.
ffmpeg: deprecate loop_input and loop_output options
gif: add loop private option.
img2: add loop private option.
AVOptions: in av_opt_find() don't return named constants unless unit is specified.
x11grab: replace undocumented nomouse hackery with a private option.
dict: extend documentation.
lls: whitespace cosmetics
docs: Use proper markup for a literal command line option
docs: Remove a remark that isn't relevant any longer
docs: Explain how to regenerate import libraries with MSVC tools
docs: Mention that libraries for MSVC can be built with a cross compiler
docs: Remove old docs that mention setting up a build environment with lib.exe
...
Conflicts:
doc/ffmpeg.texi
doc/general.texi
ffmpeg.c
libavcodec/Makefile
libavcodec/dnxhddata.c
libavformat/mp3enc.c
libavformat/utils.c
libavutil/Makefile
tests/copycooker.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-07-09 02:06:40 +02:00
..
2011-07-06 01:34:08 +02:00
2011-07-06 01:34:08 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-07-05 02:26:17 +02:00
2011-05-17 00:58:33 +02:00
2011-06-02 20:06:00 +01:00
2011-05-22 04:53:19 +02:00
2011-06-08 05:25:28 +02:00
2011-07-03 03:14:10 +02:00
2011-06-30 04:32:24 +02:00
2011-07-01 05:35:26 +02:00
2011-06-30 04:32:24 +02:00
2011-07-01 05:35:26 +02:00
2011-07-04 00:45:21 +02:00
2011-06-30 04:32:24 +02:00
2011-05-19 06:00:31 +02:00
2011-05-19 06:00:31 +02:00
2011-07-03 03:14:10 +02:00
2011-05-25 06:32:45 +02:00
2011-05-25 06:32:45 +02:00
2011-06-21 03:38:25 +02:00
2011-07-03 03:14:10 +02:00
2011-07-02 03:24:32 +02:00
2011-05-29 03:34:35 +02:00
2011-05-29 03:34:35 +02:00
2011-07-02 03:24:32 +02:00
2011-07-02 03:24:32 +02:00
2011-06-13 16:49:35 -04:00
2011-07-01 13:02:11 -04:00
2011-06-29 05:23:12 +02:00
2011-07-02 03:24:32 +02:00
2011-05-25 06:32:45 +02:00
2011-05-25 06:32:45 +02:00
2011-07-04 00:45:21 +02:00
2011-06-24 03:07:04 +02:00
2011-05-16 05:01:40 +02:00
2011-05-21 01:11:42 +02:00
2011-05-29 03:34:35 +02:00
2011-06-21 03:38:25 +02:00
2011-07-03 03:14:10 +02:00
2011-05-22 04:53:19 +02:00
2011-07-04 00:45:21 +02:00
2011-07-03 03:14:10 +02:00
2011-07-03 03:14:10 +02:00
2011-07-04 00:45:21 +02:00
2011-05-21 02:31:27 +02:00
2011-05-27 02:53:21 +02:00
2011-07-06 23:57:11 +02:00
2011-07-05 17:38:37 +02:00
2011-07-03 03:14:10 +02:00
2011-06-21 03:38:25 +02:00
2011-06-21 03:38:25 +02:00
2011-05-13 04:40:40 +02:00
2011-05-13 04:40:40 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-06-02 20:06:00 +01:00
2011-06-24 03:07:04 +02:00
2011-05-22 04:53:19 +02:00
2011-07-04 00:45:21 +02:00
2011-05-20 05:48:22 +02:00
2011-06-21 21:03:46 -07:00
2011-07-05 02:26:17 +02:00
2011-06-18 11:36:35 +02:00
2011-05-17 13:57:23 +01:00
2011-05-17 13:57:23 +01:00
2011-05-18 05:42:42 +02:00
2011-05-17 13:57:23 +01:00
2011-07-05 02:26:17 +02:00
2011-05-18 05:42:42 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-05-15 13:12:47 +02:00
2011-06-03 05:19:30 +02:00
2011-07-09 02:06:40 +02:00
2011-06-26 14:09:48 -07:00
2011-05-12 13:08:10 +02:00
2011-06-08 05:25:28 +02:00
2011-07-06 01:34:08 +02:00
2011-07-02 03:24:32 +02:00
2011-07-02 03:24:32 +02:00
2011-05-22 04:53:19 +02:00
2011-07-05 18:46:23 +02:00
2011-06-08 05:25:28 +02:00
2011-06-09 04:47:19 +02:00
2011-05-24 19:10:28 +02:00
2011-06-27 12:59:39 -04:00
2011-06-07 15:16:41 -04:00
2011-06-21 03:38:25 +02:00
2011-06-27 03:32:45 +02:00
2011-06-24 03:07:04 +02:00
2011-07-04 00:45:21 +02:00
2011-06-19 03:54:15 +02:00
2011-07-09 02:06:40 +02:00
2011-07-04 00:45:21 +02:00
2011-05-22 04:53:19 +02:00
2011-05-19 06:00:31 +02:00
2011-05-19 06:00:31 +02:00
2011-06-24 03:07:04 +02:00
2011-07-02 03:24:32 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-07-01 03:04:46 +02:00
2011-07-04 00:45:21 +02:00
2011-07-04 00:45:21 +02:00
2011-06-02 10:16:20 -07:00
2011-07-06 23:57:11 +02:00
2011-07-04 00:45:21 +02:00
2011-06-24 03:07:04 +02:00
2011-06-23 04:49:04 +02:00
2011-07-04 00:45:21 +02:00
2011-07-04 00:45:21 +02:00
2011-07-06 01:34:08 +02:00
2011-06-15 02:15:25 +02:00
2011-07-06 01:34:08 +02:00
2011-07-06 01:34:08 +02:00
2011-07-05 02:26:17 +02:00
2011-05-28 18:25:40 +02:00
2011-05-25 11:29:47 +02:00
2011-06-03 05:19:30 +02:00
2011-06-10 04:47:23 +02:00
2011-06-03 05:19:30 +02:00
2011-07-04 00:45:21 +02:00
2011-06-03 05:19:30 +02:00
2011-06-03 05:19:30 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:54 +02:00
2011-05-24 01:31:54 +02:00
2011-06-08 16:38:37 +02:00
2011-05-24 01:31:53 +02:00
2011-05-12 11:56:53 +02:00
2011-05-12 11:56:53 +02:00
2011-05-22 04:53:19 +02:00
2011-06-24 03:07:04 +02:00
2011-06-06 03:33:58 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-06-15 10:57:26 +02:00
2011-07-08 01:05:28 +02:00
2011-05-20 15:28:29 -04:00
2011-07-06 01:34:08 +02:00
2011-07-09 02:06:40 +02:00
2011-07-08 01:05:28 +02:00
2011-07-05 02:26:17 +02:00
2011-07-05 02:26:17 +02:00
2011-06-21 04:45:29 +02:00
2011-07-05 02:26:17 +02:00
2011-07-04 00:45:21 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-07-09 02:06:40 +02:00
2011-06-05 03:00:31 +02:00
2011-05-19 06:00:31 +02:00
2011-07-04 00:45:21 +02:00
2011-06-15 01:16:58 +02:00
2011-05-13 00:22:05 +02:00
2011-05-23 01:23:33 +02:00
2011-06-08 05:25:28 +02:00
2011-07-04 00:45:21 +02:00
2011-06-24 03:07:04 +02:00
2011-05-22 04:53:19 +02:00
2011-05-21 05:32:03 +02:00
2011-05-21 05:32:03 +02:00
2011-05-20 05:48:22 +02:00
2011-06-05 03:00:31 +02:00
2011-05-20 05:48:22 +02:00
2011-06-05 03:00:31 +02:00
2011-06-05 03:00:31 +02:00
2011-05-22 04:53:19 +02:00
2011-07-01 03:04:46 +02:00
2011-06-27 03:32:45 +02:00
2011-07-04 00:45:21 +02:00
2011-06-03 05:19:30 +02:00
2011-06-21 03:07:11 +02:00
2011-05-18 05:42:42 +02:00
2011-05-22 04:53:19 +02:00
2011-05-21 05:32:03 +02:00
2011-05-21 05:32:03 +02:00
2011-06-01 00:09:05 +02:00
2011-06-02 05:12:10 +02:00
2011-05-21 05:32:03 +02:00
2011-05-21 05:32:03 +02:00
2011-06-05 03:00:31 +02:00
2011-05-19 12:25:34 +01:00
2011-05-19 12:25:34 +01:00
2011-05-23 17:33:03 +02:00
2011-06-14 04:56:26 +02:00
2011-06-13 11:33:44 +01:00
2011-06-02 05:12:10 +02:00
2011-07-04 00:45:21 +02:00
2011-06-03 05:19:30 +02:00
2011-07-05 02:26:17 +02:00
2011-07-05 02:26:17 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-22 04:53:19 +02:00
2011-06-03 05:19:30 +02:00
2011-05-25 06:32:45 +02:00
2011-05-15 03:25:57 +02:00
2011-05-21 13:48:10 +02:00
2011-06-24 03:07:04 +02:00
2011-07-04 12:54:26 +02:00
2011-06-18 05:10:38 +02:00
2011-05-22 04:53:19 +02:00
2011-07-04 00:45:21 +02:00
2011-07-01 05:35:26 +02:00
2011-06-03 05:19:30 +02:00
2011-06-30 04:32:24 +02:00
2011-06-30 04:32:24 +02:00
2011-06-03 05:19:30 +02:00
2011-07-03 03:14:10 +02:00
2011-07-03 03:14:10 +02:00
2011-06-24 03:07:04 +02:00
2011-05-22 04:53:19 +02:00
2011-06-20 21:03:59 +02:00
2011-06-08 16:38:37 +02:00
2011-07-06 10:05:08 +02:00
2011-07-06 10:05:08 +02:00
2011-05-22 04:53:19 +02:00
2011-06-21 03:38:25 +02:00
2011-06-24 03:07:04 +02:00
2011-06-03 05:19:30 +02:00
2011-07-05 02:26:17 +02:00
2011-07-03 03:14:10 +02:00
2011-06-07 03:37:57 +02:00
2011-07-03 03:14:10 +02:00
2011-07-04 00:45:21 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-06-20 04:07:34 +02:00
2011-06-20 04:07:34 +02:00
2011-07-04 00:45:21 +02:00
2011-06-02 20:06:00 +01:00
2011-05-12 18:02:28 +02:00
2011-06-07 13:20:57 +02:00
2011-07-04 00:45:21 +02:00
2011-07-03 03:14:10 +02:00
2011-06-28 18:48:35 +02:00
2011-05-22 04:53:19 +02:00
2011-06-04 06:35:17 +02:00
2011-06-06 03:33:58 +02:00
2011-05-13 16:34:23 +02:00
2011-06-03 05:19:30 +02:00
2011-06-03 05:19:30 +02:00
2011-06-24 03:07:04 +02:00
2011-07-04 00:45:21 +02:00
2011-06-08 05:25:28 +02:00
2011-06-24 03:07:04 +02:00
2011-05-30 00:24:01 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-07-03 03:14:10 +02:00
2011-07-05 02:26:17 +02:00
2011-07-04 00:02:37 -07:00
2011-06-24 03:07:04 +02:00
2011-06-10 12:13:08 +02:00
2011-06-21 03:38:25 +02:00
2011-06-03 05:19:30 +02:00
2011-05-13 04:40:40 +02:00
2011-06-21 03:38:25 +02:00
2011-05-13 04:40:40 +02:00
2011-07-05 02:26:17 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-06-03 05:19:30 +02:00
2011-06-19 03:54:15 +02:00
2011-06-21 13:17:10 +02:00
2011-05-12 18:02:28 +02:00
2011-06-04 06:35:17 +02:00
2011-07-03 03:14:10 +02:00
2011-07-04 00:45:21 +02:00
2011-06-24 03:07:04 +02:00
2011-05-22 04:53:19 +02:00
2011-06-02 20:06:00 +01:00