Commit Graph

231 Commits

Author SHA1 Message Date
Reimar Döffinger 148ffcd2ce Make DV (sub) demuxer set proper pkt->pos values.
This makes the avi demuxer create packets with proper pos values
with the file from ticket #140.
2011-05-02 18:38:01 +02:00
Michael Niedermayer 8772156be0 Merge remote branch 'qatar/master'
* qatar/master:
  APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
  Introduce slice threads flag.
  FATE: allow forcing thread-type when doing threaded fate runs.
  Use av_log_ask_for_sample() where appropriate.
  error: sort, pack, and align error code and string definitions
  The stabilization period after version bumps should be one month, not one week.
  applehttp: Expose the stream bitrate via metadata
  doc: Add some initial docs on the applehttp demuxer
  Provide a fallback version of the libm function trunc
  libavdevice: Define _XOPEN_SOURCE for usleep
  lavc: provide deprecated avcodec_thread_init until next major version
  lavc: provide the opt.h header until the next bump
  error: change AVERROR_EOF value
  error: remove AVERROR_NUMEXPECTED
  error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c

Conflicts:
	libavcodec/h264.c
	libavutil/error.c
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-22 03:54:30 +02:00
Martin Storsjö 32a128522a libavdevice: Define _XOPEN_SOURCE for usleep
This hopefully fixes build failures on Dragonfly BSD.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-04-21 14:13:09 +03:00
Michael Niedermayer efb5fa79f5 Merge remote branch 'qatar/master'
* qatar/master: (37 commits)
  In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function.
  lavc: remove reference to opt.h from Makefile.
  prefer avio_check() over url_exist()
  avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols
  lavu: remove misc disabled cruft
  lavu: remove FF_API_OLD_IMAGE_NAMES cruft
NOT PULLED  lavu: remove FF_API_OLD_EVAL_NAMES cruft
  lavc: remove misc disabled cruft.
  lavc: remove the FF_API_INOFFICIAL cruft.
  lavc: remove the FF_API_SET_STRING_OLD cruft.
  lavc: remove the FF_API_USE_LPC cruft.
  lavc: remove the FF_API_SUBTITLE_OLD cruft.
  lavc: remove the FF_API_VIDEO_OLD cruft.
  lavc: remove the FF_API_AUDIO_OLD cruft.
  lavc: remove the FF_API_OPT_SHOW cruft.
  lavc: remove the FF_API_MM_FLAGS cruft.
  lavf: remove misc disabled cruft.
  lavf: remove FF_API_INDEX_BUILT cruft
  lavf: remove FF_API_URL_CLASS cruft.
  lavf: remove FF_API_SYMVER cruft
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-20 04:48:23 +02:00
Anton Khirnov 139f3ac42d Bump major versions of all libraries.
They've accumulated enough new APIs and corresponding deprecated cruft.

This breaks API and ABI.
2011-04-18 20:19:47 +02:00
Carl Eugen Hoyos f4bc923ec1 Allow to print wider unsupported channel layouts. 2011-04-15 11:50:28 +02:00
Carl Eugen Hoyos b8a4444266 AV_CH_LAYOUT_2_2 does not need channel reordering for alsa output. 2011-04-14 04:16:53 +02:00
Carl Eugen Hoyos 19de9d5646 Cosmetics: Fix indentation and move one line. 2011-04-14 03:33:10 +02:00
Carl Eugen Hoyos 460acdf059 Support alsa channel reordering for float. 2011-04-14 03:33:10 +02:00
Carl Eugen Hoyos e2049edb4e Add forgotten line to silence a warning for int32.
AV_CH_LAYOUT_QUAD is the only (multi-) channel layout that has the
same channel ordering for FFmpeg and alsa.
2011-04-14 03:33:10 +02:00
Carl Eugen Hoyos 47c0c8ca9d Also support alsa channel reordering for u16 and u32 formats. 2011-04-14 03:33:10 +02:00
Carl Eugen Hoyos 1171d45f6c Rename the s16 and s32 alsa reorder functions as int16 and int32.
The functions will also be used for unsigned formats.
2011-04-14 03:33:10 +02:00
Carl Eugen Hoyos 0ae2a0366f Support unsigned variants of already supported signed formats in alsa. 2011-04-14 03:33:10 +02:00
Carl Eugen Hoyos 075a55603f Support a-law and mu-law output in alsa. 2011-04-14 03:33:10 +02:00
Sven C. Dack 44a8b0ddd9 Cosmetics: Rename variable param as the more appropriate dpyname. 2011-04-12 09:33:19 +02:00
Sven C. Dack 9af2097120 Cosmetics: Fix white-space in av_log() message. 2011-04-12 09:27:23 +02:00
Carl Eugen Hoyos ff2614ee4c Fix output of AV_CH_LAYOUT_5POINT0 via alsa by reordering channels. 2011-04-12 09:17:26 +02:00
Carl Eugen Hoyos 71306c5d21 Support CODEC_ID_PCM_F64* output via alsa (stereo only). 2011-04-12 09:11:56 +02:00
Carl Eugen Hoyos 5778466e92 Support CODEC_ID_PCM_S24* output via alsa (stereo only). 2011-04-12 08:56:29 +02:00
Michael Niedermayer 2e92a34cde Revert "fbdev: simplify logic in fbdev_read_packet()"
This change is buggy.

This reverts commit d46c9f83cf.
2011-04-11 00:37:52 +02:00
Stefano Sabatini d46c9f83cf fbdev: simplify logic in fbdev_read_packet()
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
2011-04-11 00:14:20 +02:00
Carl Eugen Hoyos c55efca05b x11: fix memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-10 03:49:24 +02:00
Carl Eugen Hoyos 2ed05f657f Add support for pcm_f32* to alsa. 2011-04-05 16:12:41 +02:00
Carl Eugen Hoyos 4d1d6f7a3c Support s32 output via alsa audio device. 2011-04-05 11:03:19 +02:00
Carl Eugen Hoyos efec2d7b35 Template alsa reordering functions. 2011-04-05 11:03:19 +02:00
Nicolas George 1e96d4c71e ALSA: fix a stupid bad use of av_freep.
It caused a segfault when channel reordering was in use and the last chunk
of data was not silent.
Spotted and diagnosed by Carl Eugen Hoyos.
2011-03-31 18:49:07 +02:00
Sven C. Dack 39530272c5 Remove a memory allocation and the associated memcpy. 2011-03-30 17:02:29 +02:00
Carl Eugen Hoyos 3efaa24f85 Also use alsa_reorder_s16_out_51() for AV_CH_LAYOUT_5POINT1. 2011-03-30 12:36:52 +02:00
Brad 2eddfb2b13 sndio bug fix
Since the code already supports both little- and big-endian
audio for recording, do not fail just because the endianness is not
what we expect.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-29 21:19:39 -07:00
Reimar Döffinger 1862778732 sndio: allow any endianness when recording
Since the code already supports both little- and big-endian
audio for recording, do not fail just because the endianness is not
what we expect.
It is possible that 8-bit recording would not have worked at all on
some systems without that change.
2011-03-29 20:21:47 +02:00
Reimar Döffinger e76c0c6a00 Simplify: Use FFMIN. 2011-03-29 20:18:45 +02:00
Michael Niedermayer 59bf303d68 Merge remote-tracking branch 'newdev/master'
* newdev/master:
  ac3enc: avoid memcpy() of exponents and baps in EXP_REUSE case by using exponent reference blocks.
  Chronomaster DFA decoder
DUPLICATE:  framebuffer device demuxer
NOT MERGED: cosmetics: fix dashed line length after 070c5d0
  http: header field names are case insensitive

Conflicts:
	LICENSE
	README
	doc/indevs.texi
	libavdevice/fbdev.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-29 02:46:11 +02:00
Stefano Sabatini e93d97156d sndio: prefer "FFmpeg" over "Libav" in the license header 2011-03-28 22:50:09 +02:00
Stefano Sabatini c6f951442e framebuffer device demuxer
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-03-28 16:49:22 +02:00
Michael Niedermayer 25d8099beb Merge remote-tracking branch 'newdev/master'
* newdev/master:
  ac3enc: Add codec-specific options for writing AC-3 metadata.
NOT MERGED:  Remove arrozcru URL from documentation
  sndio support for playback and record

Conflicts:
	doc/faq.texi
	doc/general.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-28 01:50:36 +02:00
Brad 15d59d2cea sndio support for playback and record
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-03-27 10:46:45 +02:00
Nicolas George 813dbb4442 ALSA: implement channel layout for playback.
Currently, only S16 quad, 5.1 and 7.1 are implemented.
Implementing support for other formats/layouts and capture should be
straightforward.

7.1 support by Carl Eugen Hoyos.
2011-03-26 16:50:09 +01: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 e528cdac8a Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"
This reverts commit 29ba091136.
2011-03-17 17:26:45 +01:00
Michael Niedermayer 0cb88628fb Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*"
This reverts commit a03be6e1ba.
2011-03-17 17:26:45 +01: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
Janne Grunau a03be6e1ba use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_* 2011-03-16 21:54:39 +01:00
Janne Grunau 29ba091136 replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION
also update the multiple inclusion guards in config.h|mak
2011-03-16 21:54:39 +01:00
Stefano Sabatini 478607668c fbdev: fix check on nanosleep return vale
In fbdev_read_packet(): nanosleep returns -1 in case of errors,
the EINTR check has to be done on errno.

Spotted by Nicolas.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-13 01:41:46 +01:00
Stefano Sabatini 1a204f0760 framebuffer device demuxer 2011-03-08 17:33:23 +01:00
Reinhard Tartler 7ffe76e540 Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
2011-02-16 23:00:30 +01:00
Reinhard Tartler 737eb5976f Merge libavcore into libavutil
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-15 16:18:21 +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
Diego Elio Pettenò c6610a216e 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.
2011-01-26 22:10:09 +00:00
Janne Grunau 2c3589bfda consolidate .gitignore patters into a single file
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-18 21:32:05 +01:00