ffmpeg.git
8 years agoljpeg: Check that lowres is 0 as lowres is not possible with ljpeg.
Michael Niedermayer [Wed, 14 Dec 2011 21:48:30 +0000 (22:48 +0100)]
ljpeg: Check that lowres is 0 as lowres is not possible with ljpeg.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Wed, 14 Dec 2011 21:31:42 +0000 (22:31 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: clear pkt_temp when pkt is freed.
  ffplay: Fix got_frame type.
  ffplay: add 10 minute seek support to ffplay
  ffplay: force setting video mode on fullscreen toggle

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years ago4xm: check if there are bits left in decode_i_block()
Michael Niedermayer [Wed, 14 Dec 2011 21:20:39 +0000 (22:20 +0100)]
4xm: check if there are bits left in decode_i_block()
Fixed Ticket753
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoriff: Fix freeing of random value.
Michael Niedermayer [Wed, 14 Dec 2011 20:23:03 +0000 (21:23 +0100)]
riff: Fix freeing of random value.
Fixes Ticket752
Bug-found-by: Diana Elena Muscalu
8 years agoffplay: clear pkt_temp when pkt is freed.
Michael Niedermayer [Tue, 13 Dec 2011 23:38:23 +0000 (00:38 +0100)]
ffplay: clear pkt_temp when pkt is freed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agoffplay: Fix got_frame type.
Michael Niedermayer [Tue, 13 Dec 2011 23:38:22 +0000 (00:38 +0100)]
ffplay: Fix got_frame type.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agoffplay: add 10 minute seek support to ffplay
Panagiotis H.M. Issaris [Mon, 28 Nov 2011 12:48:13 +0000 (13:48 +0100)]
ffplay: add 10 minute seek support to ffplay

Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agoffplay: force setting video mode on fullscreen toggle
Marton Balint [Tue, 13 Dec 2011 22:27:24 +0000 (23:27 +0100)]
ffplay: force setting video mode on fullscreen toggle

Fixes ticket #736. Based on the patch by glangshaw.

Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agofate: split off map_channel tests.
Clément Bœsch [Wed, 14 Dec 2011 19:04:32 +0000 (20:04 +0100)]
fate: split off map_channel tests.

Also introduce a fate-mapchan rule for all of them.

8 years agoPrevent segfault if iformat was not yet initialized.
Panagiotis H.M. Issaris [Wed, 14 Dec 2011 16:15:53 +0000 (17:15 +0100)]
Prevent segfault if iformat was not yet initialized.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompeg12enc: fix drop_frame_timecode value
Matthieu Bouron [Wed, 14 Dec 2011 13:30:39 +0000 (14:30 +0100)]
mpeg12enc: fix drop_frame_timecode value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoCosmetics: Improve 'too short LIST' error message in wav.c.
Carl Eugen Hoyos [Wed, 14 Dec 2011 14:11:10 +0000 (15:11 +0100)]
Cosmetics: Improve 'too short LIST' error message in wav.c.

8 years agoDo not reject LIST tags in wav with size 4.
Carl Eugen Hoyos [Wed, 14 Dec 2011 14:09:30 +0000 (15:09 +0100)]
Do not reject LIST tags in wav with size 4.

Fixes ticket #745.

8 years agoDetect 'yuv2' as rawvideo also in avi.
Carl Eugen Hoyos [Wed, 14 Dec 2011 14:08:59 +0000 (15:08 +0100)]
Detect 'yuv2' as rawvideo also in avi.

8 years agocosmetic: consistent spacing over the Changelog.
Clément Bœsch [Wed, 14 Dec 2011 06:29:58 +0000 (07:29 +0100)]
cosmetic: consistent spacing over the Changelog.

8 years agofate: fix v410 on big endian
Michael Niedermayer [Wed, 14 Dec 2011 04:19:53 +0000 (05:19 +0100)]
fate: fix v410 on big endian

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofate: Add FATE tests for v410 encoder and decoder
Derek Buitenhuis [Tue, 13 Dec 2011 22:19:00 +0000 (17:19 -0500)]
fate: Add FATE tests for v410 encoder and decoder

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agov410 encoder and decoder
Derek Buitenhuis [Tue, 13 Dec 2011 19:24:56 +0000 (14:24 -0500)]
v410 encoder and decoder

v410 is a packed 10-bit 4:4:4 YCbCr format used in
QuickTime.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMAINTAINERS: add 0.9
Michael Niedermayer [Tue, 13 Dec 2011 23:57:34 +0000 (00:57 +0100)]
MAINTAINERS: add 0.9

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoac3dec: update checked AV_EF flags.
Michael Niedermayer [Sat, 19 Nov 2011 19:37:42 +0000 (20:37 +0100)]
ac3dec: update checked AV_EF flags.

A user who wishes to use default error concealment cannot set the
AV_EF_CRCCHECK flag because not every CRC in every format is a
reliable indicator of bitstream damage. In some formats crcrs
can be nonsensical in absence of any damage. We thus add the
AV_EF_CAREFUL flag in addition to the AV_EF_CRCCHECK flag to
allow a user to enable this reliable CRC check without having to
enable all CRC checks in all formats.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 13 Dec 2011 22:21:37 +0000 (23:21 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ulti: Fix invalid reads
  lavf: dealloc private options in av_write_trailer
  yadif: support 10bit YUV
  vc1: mark with ER_MB_ERROR bits overconsumption
  lavc: introduce ER_MB_END and ER_MB_ERROR
  error_resilience: use the ER_ namespace
  build: move inclusion of subdir.mak to main subdir loop
  rv34: NEON optimised 4x4 dequant
  rv34: move 4x4 dequant to RV34DSPContext
  aacdec: Use intfloat.h rather than local punning union.

Conflicts:
libavcodec/h264.c
libavcodec/vc1dec.c
libavfilter/vf_yadif.c
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoSupport "VLB " audio in NSV files.
Reimar Döffinger [Sun, 11 Dec 2011 16:37:40 +0000 (17:37 +0100)]
Support "VLB " audio in NSV files.

See samples/nsv/vlb_audio.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agocleanup: for(int
Michael Niedermayer [Tue, 13 Dec 2011 20:01:45 +0000 (21:01 +0100)]
cleanup: for(int

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoclenaup: #ifdec CONFIG*
Michael Niedermayer [Tue, 13 Dec 2011 19:53:21 +0000 (20:53 +0100)]
clenaup: #ifdec CONFIG*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi: use the new audio API in amovie source filter.
Clément Bœsch [Tue, 13 Dec 2011 14:36:34 +0000 (15:36 +0100)]
lavfi: use the new audio API in amovie source filter.

8 years agolavfi: skip the frame in case of error.
Clément Bœsch [Tue, 13 Dec 2011 14:54:59 +0000 (15:54 +0100)]
lavfi: skip the frame in case of error.

This fixes playback with some audio files through filters.

8 years agolavc: set pkt_?ts to NOPTS in get_frame_defaults.
Michael Niedermayer [Tue, 13 Dec 2011 19:04:04 +0000 (20:04 +0100)]
lavc: set pkt_?ts to NOPTS in get_frame_defaults.

Idea-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix all GNU %Ld
Michael Niedermayer [Tue, 13 Dec 2011 19:01:49 +0000 (20:01 +0100)]
Fix all GNU %Ld

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotwinnvq: remove ;;
Michael Niedermayer [Tue, 13 Dec 2011 18:54:31 +0000 (19:54 +0100)]
twinnvq: remove ;;

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodecoding example: reset pts/dts after subpacket.
Michael Niedermayer [Tue, 13 Dec 2011 18:47:57 +0000 (19:47 +0100)]
decoding example: reset pts/dts after subpacket.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: reset dts/pts after decoding the first subpacket
Michael Niedermayer [Tue, 13 Dec 2011 18:46:29 +0000 (19:46 +0100)]
ffmpeg: reset dts/pts after decoding the first subpacket

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoulti: Fix invalid reads
Gaurav Narula [Tue, 13 Dec 2011 17:41:37 +0000 (23:11 +0530)]
ulti: Fix invalid reads

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolavf: dealloc private options in av_write_trailer
Luca Barbato [Mon, 12 Dec 2011 17:22:22 +0000 (18:22 +0100)]
lavf: dealloc private options in av_write_trailer

Fix the iformat/oformat typo.

8 years agoyadif: support 10bit YUV
Luca Barbato [Sun, 4 Dec 2011 14:56:41 +0000 (15:56 +0100)]
yadif: support 10bit YUV

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agovc1: mark with ER_MB_ERROR bits overconsumption
Luca Barbato [Sun, 27 Nov 2011 23:31:53 +0000 (00:31 +0100)]
vc1: mark with ER_MB_ERROR bits overconsumption

This patch is a generalization of what Michael Niedermayer
fixed in a single case.

The wmv8-drm fate test had been updated accordingly.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agolavc: introduce ER_MB_END and ER_MB_ERROR
Luca Barbato [Sun, 27 Nov 2011 23:31:52 +0000 (00:31 +0100)]
lavc: introduce ER_MB_END and ER_MB_ERROR

Simplify a little error resilience calls

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agoerror_resilience: use the ER_ namespace
Luca Barbato [Sun, 27 Nov 2011 23:31:51 +0000 (00:31 +0100)]
error_resilience: use the ER_ namespace

Add the namespace to {AC_,DC_,MV_}{END,ERROR} macros

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agomsrledec: Check for overreads
Michael Niedermayer [Tue, 13 Dec 2011 14:45:43 +0000 (15:45 +0100)]
msrledec: Check for overreads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaascdec: Check input buffer size on raw data.
Michael Niedermayer [Tue, 13 Dec 2011 14:45:04 +0000 (15:45 +0100)]
aascdec: Check input buffer size on raw data.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobuild: move inclusion of subdir.mak to main subdir loop
Mans Rullgard [Tue, 13 Dec 2011 13:28:01 +0000 (13:28 +0000)]
build: move inclusion of subdir.mak to main subdir loop

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agorv34: NEON optimised 4x4 dequant
Mans Rullgard [Mon, 12 Dec 2011 23:22:04 +0000 (23:22 +0000)]
rv34: NEON optimised 4x4 dequant

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agorv34: move 4x4 dequant to RV34DSPContext
Mans Rullgard [Mon, 12 Dec 2011 23:21:39 +0000 (23:21 +0000)]
rv34: move 4x4 dequant to RV34DSPContext

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoaacdec: Use intfloat.h rather than local punning union.
Alex Converse [Mon, 12 Dec 2011 18:23:51 +0000 (10:23 -0800)]
aacdec: Use intfloat.h rather than local punning union.

8 years agomp4enc: Avoid storing sizes in trun when they all match.
Michael Niedermayer [Tue, 13 Dec 2011 02:27:19 +0000 (03:27 +0100)]
mp4enc: Avoid storing sizes in trun when they all match.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomp4enc: Only store flags in trun when they differ from the default and set a sane...
Michael Niedermayer [Tue, 13 Dec 2011 02:11:53 +0000 (03:11 +0100)]
mp4enc: Only store flags in trun when they differ from the default and set a sane default.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomp4enc: dont store durations in trun if they are unneeded.
Michael Niedermayer [Tue, 13 Dec 2011 02:02:20 +0000 (03:02 +0100)]
mp4enc: dont store durations in trun if they are unneeded.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomp4enc: dont store cts in trun if they are unneeded.
Michael Niedermayer [Tue, 13 Dec 2011 01:55:37 +0000 (02:55 +0100)]
mp4enc: dont store cts in trun if they are unneeded.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc: use hexadecimal debug print for showing err_recognization values.
Michael Niedermayer [Tue, 13 Dec 2011 00:28:22 +0000 (01:28 +0100)]
lavc: use hexadecimal debug print for showing err_recognization values.
They are flags which makes them easier to read as hex than decimal.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomsmpeg4dec: restore error concealment functionality after merge
Michael Niedermayer [Tue, 13 Dec 2011 00:26:28 +0000 (01:26 +0100)]
msmpeg4dec: restore error concealment functionality after merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompeg4dec: restore error concealment functionality after merge
Michael Niedermayer [Tue, 13 Dec 2011 00:26:14 +0000 (01:26 +0100)]
mpeg4dec: restore error concealment functionality after merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh263dec: restore error concealment functionality after merge
Michael Niedermayer [Tue, 13 Dec 2011 00:25:08 +0000 (01:25 +0100)]
h263dec: restore error concealment functionality after merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 12 Dec 2011 23:29:25 +0000 (00:29 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doxygen: misc consistency, spelling and wording fixes
  vcr1: drop unnecessary emms_c() calls without MMX code
  Replace all uses of av_close_input_file() with avformat_close_input().
  lavf: add avformat_close_input().
  lavf: deprecate av_close_input_stream().
  lavf doxy: add some basic demuxing documentation.
  lavf doxy: add some general lavf information.
  lavf doxy: add misc utility functions to a group.
  lavf doxy: add av_guess_codec/format to the encoding group.
  lavf doxy: add core functions to a doxy group.
  Add basic libavdevice documentation.
  lavc: convert error_recognition to err_recognition.
  avconv: update -map option help text
  x86: Require 7 registers for the cabac asm
  x86: bswap: remove test for bswap instruction
  bswap: make generic implementation more compiler-friendly
  h264: remove useless cast
  proresdec: fix decode_slice() prototype

Conflicts:
configure
doc/APIchanges
ffprobe.c
libavcodec/avcodec.h
libavcodec/celp_math.h
libavcodec/h264.c
libavfilter/src_movie.c
libavformat/anm.c
libavformat/avformat.h
libavformat/version.h
libavutil/avstring.h
libavutil/bswap.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobuild: Disable avconv more completely while leaving the user the option to enable it
Michael Niedermayer [Mon, 12 Dec 2011 19:59:04 +0000 (20:59 +0100)]
build: Disable avconv more completely while leaving the user the option to enable it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodoxygen: misc consistency, spelling and wording fixes
Diego Biurrun [Wed, 7 Dec 2011 12:03:53 +0000 (13:03 +0100)]
doxygen: misc consistency, spelling and wording fixes

8 years agoUpdate seek reference for added metadata to lavf tests.
Reimar Döffinger [Mon, 12 Dec 2011 20:53:33 +0000 (21:53 +0100)]
Update seek reference for added metadata to lavf tests.

As far as I could see the only change is increased pos values,
which is as expected with additional metadata in the files.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agovcr1: drop unnecessary emms_c() calls without MMX code
Paul B Mahol [Sat, 10 Dec 2011 16:39:21 +0000 (16:39 +0000)]
vcr1: drop unnecessary emms_c() calls without MMX code

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agolavf-regression: minimal metadata test.
Reimar Döffinger [Sun, 11 Dec 2011 19:31:03 +0000 (20:31 +0100)]
lavf-regression: minimal metadata test.

This tests writing the global "title" metadata.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoReplace all uses of av_close_input_file() with avformat_close_input().
Anton Khirnov [Sun, 11 Dec 2011 09:38:28 +0000 (10:38 +0100)]
Replace all uses of av_close_input_file() with avformat_close_input().

8 years agolavf: add avformat_close_input().
Anton Khirnov [Sun, 11 Dec 2011 09:34:08 +0000 (10:34 +0100)]
lavf: add avformat_close_input().

It sets the supplied AVFormatContext pointer to NULL after freeing it,
which is safer and its name is consistent with other lavf functions.

Also deprecate av_close_input_file().

8 years agolavf: deprecate av_close_input_stream().
Anton Khirnov [Sun, 11 Dec 2011 09:01:46 +0000 (10:01 +0100)]
lavf: deprecate av_close_input_stream().

And remove all its uses.

8 years agolavf doxy: add some basic demuxing documentation.
Anton Khirnov [Sun, 11 Dec 2011 08:51:19 +0000 (09:51 +0100)]
lavf doxy: add some basic demuxing documentation.

8 years agolavf doxy: add some general lavf information.
Anton Khirnov [Sun, 11 Dec 2011 08:05:11 +0000 (09:05 +0100)]
lavf doxy: add some general lavf information.

8 years agolavf doxy: add misc utility functions to a group.
Anton Khirnov [Sun, 11 Dec 2011 07:08:46 +0000 (08:08 +0100)]
lavf doxy: add misc utility functions to a group.

8 years agolavf doxy: add av_guess_codec/format to the encoding group.
Anton Khirnov [Sun, 11 Dec 2011 07:07:53 +0000 (08:07 +0100)]
lavf doxy: add av_guess_codec/format to the encoding group.

8 years agolavf doxy: add core functions to a doxy group.
Anton Khirnov [Sun, 11 Dec 2011 06:55:21 +0000 (07:55 +0100)]
lavf doxy: add core functions to a doxy group.

8 years agoAdd basic libavdevice documentation.
Anton Khirnov [Sun, 11 Dec 2011 11:43:50 +0000 (12:43 +0100)]
Add basic libavdevice documentation.

8 years agolavc: convert error_recognition to err_recognition.
Dustin Brody [Wed, 7 Dec 2011 13:51:36 +0000 (08:51 -0500)]
lavc: convert error_recognition to err_recognition.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agomxfdec: Set DTS and PTS on video packets
Tomas Härdin [Fri, 9 Dec 2011 16:56:46 +0000 (17:56 +0100)]
mxfdec: Set DTS and PTS on video packets

This involves computing DTS/PTS from the index tables.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomxfdec: Only sort IndexTableSegments once
Tomas Härdin [Fri, 9 Dec 2011 16:17:33 +0000 (17:17 +0100)]
mxfdec: Only sort IndexTableSegments once

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomxfdec: Add Avid's essence element key
Tomas Härdin [Sat, 10 Dec 2011 11:11:11 +0000 (12:11 +0100)]
mxfdec: Add Avid's essence element key

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomxfdec: Add support for Avid indexes
Tomas Härdin [Fri, 9 Dec 2011 15:46:38 +0000 (16:46 +0100)]
mxfdec: Add support for Avid indexes

These indexes duplicate every entry and have the total size of the essence
container as the last entry.
This patch also computes the size of the packets when unknown.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomxfdec: Check slice_count before freeing slice_offset_entries
Tomas Härdin [Fri, 9 Dec 2011 15:08:29 +0000 (16:08 +0100)]
mxfdec: Check slice_count before freeing slice_offset_entries

This fixes SIGSEGV on sliceless (single stream) VBR files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomxfdec: Bring back accumulated_offset that was removed in 5e67e3e
Tomas Härdin [Fri, 9 Dec 2011 14:48:33 +0000 (15:48 +0100)]
mxfdec: Bring back accumulated_offset that was removed in 5e67e3e

I thought it had to do with file offsets, but's actually the offset inside
the essence container.
In other words, unbreak multiple EditUnitByteCounts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotimecode: rename internal ff_* symbols to avpriv_*.
Clément Bœsch [Wed, 7 Dec 2011 09:44:50 +0000 (10:44 +0100)]
timecode: rename internal ff_* symbols to avpriv_*.

Those functions are shared between libs.

Also fix a typo in function names: smtpe → smpte.

8 years agodrawtext: allow burning the timecode.
Clément Bœsch [Tue, 6 Dec 2011 10:19:11 +0000 (11:19 +0100)]
drawtext: allow burning the timecode.

8 years agotimecode: add avpriv_timecode_to_string().
Clément Bœsch [Tue, 6 Dec 2011 10:18:26 +0000 (11:18 +0100)]
timecode: add avpriv_timecode_to_string().

8 years agotimecode: better input checks in init function.
Clément Bœsch [Tue, 6 Dec 2011 10:17:37 +0000 (11:17 +0100)]
timecode: better input checks in init function.

8 years agocleanup: remove two extraneous semicolons.
Clément Bœsch [Mon, 12 Dec 2011 00:56:52 +0000 (01:56 +0100)]
cleanup: remove two extraneous semicolons.

8 years agoffmpeg: fix codecids with ffserver + ffmpeg + ffm
Michael Niedermayer [Mon, 12 Dec 2011 16:30:55 +0000 (17:30 +0100)]
ffmpeg: fix codecids with ffserver + ffmpeg + ffm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agox86: Require 7 registers for the cabac asm
Martin Storsjö [Mon, 12 Dec 2011 12:48:53 +0000 (14:48 +0200)]
x86: Require 7 registers for the cabac asm

The change in 599b4c6ef didn't turn out to work properly on
i386 on OS X, where it broke building with PIC enabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit f1dba9e4988e78738ad9065e4639b82b8355774a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavconv: update -map option help text
Janne Grunau [Mon, 12 Dec 2011 11:45:32 +0000 (12:45 +0100)]
avconv: update -map option help text

8 years agox86: Require 7 registers for the cabac asm
Martin Storsjö [Mon, 12 Dec 2011 12:48:53 +0000 (14:48 +0200)]
x86: Require 7 registers for the cabac asm

The change in 599b4c6ef didn't turn out to work properly on
i386 on OS X, where it broke building with PIC enabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agox86: bswap: remove test for bswap instruction
Mans Rullgard [Mon, 12 Dec 2011 01:33:17 +0000 (01:33 +0000)]
x86: bswap: remove test for bswap instruction

Firstly, this test never worked as intended, always reporting
success.  Secondly, bswap is available from 486 onward and can
thus be assumed present.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agobswap: make generic implementation more compiler-friendly
Mans Rullgard [Mon, 12 Dec 2011 00:50:08 +0000 (00:50 +0000)]
bswap: make generic implementation more compiler-friendly

With these changes, gcc 4.5 and later recognise it as a bswap
and use the proper instructions on ARM and x86.  On x86, the
16-bit bswap is recognised from gcc 4.1.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoseek-test: use standard format specifiers in snprintf()
Michael Niedermayer [Mon, 12 Dec 2011 01:03:38 +0000 (02:03 +0100)]
seek-test: use standard format specifiers in snprintf()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofate: replace forgotten avconv by ffmpeg in vsynth / asynth stuff
Michael Niedermayer [Mon, 12 Dec 2011 00:44:11 +0000 (01:44 +0100)]
fate: replace forgotten avconv by ffmpeg in vsynth / asynth stuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 12 Dec 2011 00:25:37 +0000 (01:25 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: cabac: replace explicit memory references with "m" operands
  avplay: don't request a stereo downmix
  wmapro: use av_float2int()
  lavc: avoid invalid memcpy() in avcodec_default_release_buffer()
  lavu: replace int/float punning functions
  lavfi: install libavfilter/vsrc_buffer.h
  Remove extraneous semicolons
  sdp: Restore the original mp4 format h264 extradata if converted
  rtpenc: Add support for mp4 format h264
  rtpenc: Simplify code by introducing a separate end pointer
  movenc: Use the actual converted sample for RTP hinting
  Fix a bunch of common typos.

Conflicts:
doc/developer.texi
doc/eval.texi
doc/filters.texi
doc/protocols.texi
ffmpeg.c
ffplay.c
libavcodec/mpegvideo.h
libavcodec/x86/cabac.h
libavfilter/Makefile
libavformat/avformat.h
libavformat/cafdec.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/gxfenc.c
libavformat/img2.c
libavformat/movenc.c
libavformat/mpegts.c
libavformat/rtpenc_h264.c
libavformat/utils.c
libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: remove useless cast
Mans Rullgard [Sun, 11 Dec 2011 23:51:12 +0000 (23:51 +0000)]
h264: remove useless cast

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoproresdec: fix decode_slice() prototype
Mans Rullgard [Sun, 11 Dec 2011 23:36:05 +0000 (23:36 +0000)]
proresdec: fix decode_slice() prototype

Make the function prototype match the argument of
AVCodecCntext.execute() and remove the cast hiding
this mismatch.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agox86: cabac: replace explicit memory references with "m" operands
Mans Rullgard [Sun, 11 Dec 2011 21:41:59 +0000 (21:41 +0000)]
x86: cabac: replace explicit memory references with "m" operands

This replaces the explicit offset(reg) memory references with
"m" operands for the same locations.  As a result, one fewer
register operand is needed for these inline asm statements.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoavplay: don't request a stereo downmix
Justin Ruggles [Sat, 10 Dec 2011 21:59:55 +0000 (16:59 -0500)]
avplay: don't request a stereo downmix

Multi-channel output works just fine for me with SDL 1.2.14.

8 years agowmapro: use av_float2int()
Mans Rullgard [Sat, 10 Dec 2011 15:51:25 +0000 (15:51 +0000)]
wmapro: use av_float2int()

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agolavc: avoid invalid memcpy() in avcodec_default_release_buffer()
Mans Rullgard [Mon, 5 Dec 2011 15:38:10 +0000 (15:38 +0000)]
lavc: avoid invalid memcpy() in avcodec_default_release_buffer()

When the buf and last pointers are equal, the FFSWAP() results
in an invalid call to memcpy() with same source and destination
on some targets.  Although assigning a struct to itself is valid
C99, gcc does not check for this before calling memcpy().
See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=32667

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agolavu: replace int/float punning functions
Mans Rullgard [Sun, 27 Nov 2011 14:04:16 +0000 (14:04 +0000)]
lavu: replace int/float punning functions

The existing functions defined in intfloat_readwrite.[ch] are
both slow and incorrect (infinities are not handled).

This introduces a new header with fast, inline conversion
functions using direct union punning assuming an IEEE-754
system, an assumption already made throughout the code.

The one use of Intel/Motorola extended 80-bit format is
replaced by simpler code sufficient under the present
constraints (positive normal values).

The old functions are marked deprecated and retained for
compatibility.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoseektest: floatfree
Michael Niedermayer [Sun, 11 Dec 2011 18:21:39 +0000 (19:21 +0100)]
seektest: floatfree

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi: install libavfilter/vsrc_buffer.h
Andrey Utkin [Thu, 8 Dec 2011 19:27:01 +0000 (21:27 +0200)]
lavfi: install libavfilter/vsrc_buffer.h

It declares API necessary for filtering apps.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agodoc/ffmpeg.texi
Michael Niedermayer [Sun, 11 Dec 2011 17:50:39 +0000 (18:50 +0100)]
doc/ffmpeg.texi
Merge changes done to avconv.texi since the last merge into ffmpeg.texi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRemove extraneous semicolons
Mans Rullgard [Sun, 11 Dec 2011 17:07:04 +0000 (17:07 +0000)]
Remove extraneous semicolons

These semicolons cause invalid empty top-level declarations.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoSupport VP8 in NSV.
Reimar Döffinger [Sun, 11 Dec 2011 14:51:12 +0000 (15:51 +0100)]
Support VP8 in NSV.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoregressiontest: try mp2 for wtv
Michael Niedermayer [Sun, 11 Dec 2011 16:44:13 +0000 (17:44 +0100)]
regressiontest: try mp2 for wtv
our ac3 decoder outputs different things on different platforms.

Idea-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>