1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

116 Commits

Author SHA1 Message Date
Michael Niedermayer
5b56ad03fa Reimplement stream probe try
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-03 16:40:11 +02:00
Michael Niedermayer
2fd41c9067 Merge remote-tracking branch 'newdev/master'
* newdev/master:
  avio: make udp_set_remote_url/get_local_port internal.
  asfdec: also subtract preroll when reading simple index object
  matroskaenc: remove a variable that's unused after bc17bd9.
  avio: cosmetics - nicer vertical alignment.
  Remove unnecessary icc version checks
  Disable 'attribute "foo" ignored' warnings from icc
  rtsp: Don't use a locale dependent format string
  Add xd55 codec tag for XDCAM HD422 720p25 CBR files.
  configure: get libavcodec version from new version.h header
  lavc: move the version macros to a new installed header.
  matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config
  Do not use format string "%0.3f" for RTSP Range field.
  Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder.
  Document usage of import libraries created by dlltool
  configure: Set the correct lib target for arm/wince dlltool
  fate: simplify regression-funcs.sh
  fate: add support for multithread testing

Conflicts:
	libavformat/rtspdec.c
	libavutil/attributes.h
	libavutil/internal.h
	libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-24 02:16:11 +01:00
Vladimir Pantelic
4377fafda1 asfdec: also subtract preroll when reading simple index object
This was missed when ASF was changed to return timestamps
without preroll.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-23 13:46:19 +00:00
Michael Niedermayer
4fa0e24736 Merge remote-tracking branch 'newdev/master'
* newdev/master: (33 commits)
  Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size.
  Add kbdwin.o to AC3 decoder
  Detect byte-swapped AC-3 and support decoding it directly.
  cosmetics: indentation
  Always copy input data for AC3 decoder.
  ac3enc: make sym_quant() branch-free
  cosmetics: indentation
  Add a CPU flag for the Atom processor.
  id3v2: skip broken tags with invalid size
  id3v2: don't explicitly skip padding
  Make sure kbhit() is in conio.h
  fate: update wmv8-drm reference
  vc1: make P-frame deblock filter bit-exact.
  configure: Add the -D parameter to the dlltool command
  amr: Set the AVFMT_GENERIC_INDEX flag
  amr: Set the pkt->pos field properly to the start of the packet
  amr: Set the codec->bit_rate field based on the last packet
  rtsp: Specify unicast for TCP interleaved streams, too
  Set the correct target for mingw64 dlltool
  applehttp: Change the variable for stream position in seconds into int64_t
  ...

Conflicts:
	ffmpeg.c
	ffplay.c
	libavcodec/ac3dec.c
	libavformat/avio.h
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-23 02:42:56 +01:00
Anton Khirnov
933e90a69a avio: make av_url_read_fseek/fpause internal.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-21 14:54:52 -04:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Michael Niedermayer
133055c5e4 reverts parts of commit de11ee906e. The author of this patch has a poor understanding of the code 2011-03-18 17:59:24 +01:00
Michael Niedermayer
4eb41d16be Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-18 17:58:58 +01:00
Vladimir Pantelic
de11ee906e asfdec: subtract the preroll value and thus output 0 based timestamps
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-17 16:25:54 +00:00
Michael Niedermayer
0fecf2642b Merge remote-tracking branch 'newdev/master'
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17 17:22:52 +01:00
Anton Khirnov
45a8a02a41 lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-16 22:24:51 -04:00
Michael Niedermayer
6947b0c42e Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-15 16:48:42 +01:00
Anton Khirnov
3e68b3ba7b avio: deprecate url_ferror
AVIOContext.error should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-15 08:04:28 -04:00
Anton Khirnov
66e5b1df36 avio: deprecate url_feof
AVIOContext.eof_reached should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-07 17:20:31 -05:00
Anton Khirnov
384c9c2fa7 avio: add avio_tell macro as a replacement for url_ftell
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712)
2011-03-05 02:29:31 +01:00
Anton Khirnov
a2704c9712 avio: add avio_tell macro as a replacement for url_ftell
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-04 11:26:57 -05:00
Anton Khirnov
74b3f67c9c lavf: replace all uses of url_fskip with avio_seek
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e356fc57a2)
2011-03-03 14:15:08 +01:00
Anton Khirnov
f59d8ff8cd avio: avio_ prefix for url_fseek
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b4aa5dac8)
2011-03-03 14:15:03 +01:00
Anton Khirnov
e356fc57a2 lavf: replace all uses of url_fskip with avio_seek
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-01 12:22:16 -05:00
Anton Khirnov
6b4aa5dac8 avio: avio_ prefix for url_fseek
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-01 12:12:33 -05:00
Anton Khirnov
e63a362857 avio: avio_ prefixes for get_* functions
In the name of consistency:
get_byte           -> avio_r8
get_<type>         -> avio_r<type>
get_buffer         -> avio_read

get_partial_buffer will be made private later

get_strz is left out becase I want to change it later to return
something useful.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b7effd4e83)
2011-02-22 02:44:37 +01:00
Anton Khirnov
b7effd4e83 avio: avio_ prefixes for get_* functions
In the name of consistency:
get_byte           -> avio_r8
get_<type>         -> avio_r<type>
get_buffer         -> avio_read

get_partial_buffer will be made private later

get_strz is left out becase I want to change it later to return
something useful.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 11:23:22 -05:00
Anton Khirnov
471fe57e1a avio: rename ByteIOContext to AVIOContext.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd)
2011-02-20 19:05:47 +01:00
Anton Khirnov
ae628ec1fd avio: rename ByteIOContext to AVIOContext.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 08:37:15 -05:00
Mans Rullgard
288b62b1b9 asfdec: fix build for big endian targets
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aabc2682fc)
2011-02-14 23:58:21 +01:00
Anton Khirnov
607f5fe5d6 asfdec: split reading stream properties out of asf_read_header()
This contains a rename from gsize->size

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 8bf6db1b29)
2011-02-14 23:58:20 +01:00
Mans Rullgard
aabc2682fc asfdec: fix build for big endian targets
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-13 22:10:45 +00:00
Anton Khirnov
5cbd3b5d91 asfdec: don't export empty metadata
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-13 16:49:39 -05:00
Anton Khirnov
8bf6db1b29 asfdec: split reading stream properties out of asf_read_header()
This contains a rename from gsize->size

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-13 16:49:39 -05:00
Anton Khirnov
4ca29c6534 asfdec: deobfuscate reading video properties size
This code will be later split out into a function which takes a 'size'
argument, so I'm keeping the name 'sizeX' here.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0b1d291a71)
2011-02-11 02:54:10 +01:00
Anton Khirnov
e5d4a95334 asfdec: split asf_read_header()
Only trivial splits are done here -- i.e. copy/paste + reindent +
missing variable declarations.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c1fea23070)
2011-02-11 02:54:10 +01:00
Anton Khirnov
d928651011 asfdec: skip the stream bitrate list
Its contents aren't used for anything.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit d7a5106eb2)
2011-02-11 02:54:09 +01:00
Anton Khirnov
56a67a8d61 asfdec: use an ASFContext array for storing stream bitrates
This will be useful for splitting asf_read_header()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 7c7253802b)
2011-02-11 02:54:09 +01:00
Anton Khirnov
26783e8570 asfdec: move DAR list to ASFContext
This will be useful for splitting asf_read_header()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit d42b09723e)
2011-02-11 02:54:08 +01:00
Anton Khirnov
c3052f1dcc asfdec: remove some write-only values from the context
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 569ff02168)
2011-02-11 02:54:08 +01:00
Anton Khirnov
83120e3bd7 asf: split ASFContext into muxer and demuxer parts.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 4bc328a2bd)
2011-02-11 02:54:08 +01:00
Anton Khirnov
b9afb0446d asf: make ff_guidcmp inline and move it to asf.h
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e4e234fad7)
2011-02-11 02:43:49 +01:00
Anton Khirnov
0b1d291a71 asfdec: deobfuscate reading video properties size
This code will be later split out into a function which takes a 'size'
argument, so I'm keeping the name 'sizeX' here.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-10 18:05:01 -05:00
Anton Khirnov
c1fea23070 asfdec: split asf_read_header()
Only trivial splits are done here -- i.e. copy/paste + reindent +
missing variable declarations.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-10 18:03:32 -05:00
Anton Khirnov
d7a5106eb2 asfdec: skip the stream bitrate list
Its contents aren't used for anything.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-10 07:03:49 -05:00
Anton Khirnov
7c7253802b asfdec: use an ASFContext array for storing stream bitrates
This will be useful for splitting asf_read_header()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-09 22:26:03 -05:00
Anton Khirnov
d42b09723e asfdec: move DAR list to ASFContext
This will be useful for splitting asf_read_header()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-09 22:26:00 -05:00
Anton Khirnov
569ff02168 asfdec: remove some write-only values from the context
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-09 22:41:30 +00:00
Anton Khirnov
4bc328a2bd asf: split ASFContext into muxer and demuxer parts.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-09 15:31:09 -05:00
Anton Khirnov
e4e234fad7 asf: make ff_guidcmp inline and move it to asf.h
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-09 12:33:05 +00:00
Luca Barbato
9ef5a9deaf Replace dprintf with av_dlog
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb)
2011-01-30 03:41:48 +01:00
Anton Khirnov
8270482681 asfdec: ensure that the whole tag is read.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 042950542d)
2011-01-30 03:41:00 +01:00
Luca Barbato
dfd2a005eb Replace dprintf with av_dlog
dprintf clashes with POSIX.1-2008
2011-01-29 23:55:37 +01:00
Anton Khirnov
042950542d asfdec: ensure that the whole tag is read.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-28 21:33:45 +01:00
Diego Elio Pettenò
66355be3c3 Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
(cherry picked from commit c6610a216e)
2011-01-28 03:15:34 +01:00