36012 Commits

Author SHA1 Message Date
Michael Niedermayer
b84683a906 h264: Fix recovery_frame initialization when recovery_frame is -1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fba6777363eb74d926aa0eed281a77ff152a3ad5)
2012-01-03 13:34:27 +01:00
Michael Niedermayer
01ff5378f0 h264: reset picture->sync on allocation.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 36fa781bd6b4e0f40abd31431af2d29d87e9b194)
2012-01-03 13:34:23 +01:00
Michael Niedermayer
96545777d7 h264: add forgotten \n to "Invalid mix of idr and non-idr slices"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ecb14b8af73b92e5a1be47c119d2f528ff402ebd)
2012-01-03 13:34:15 +01:00
Michael Niedermayer
1506becf36 h264: Print pass in NAL debug output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 393253b4b3b454830b22c8e69acbe11e2684da7e)
2012-01-03 13:26:56 +01:00
Tom Evans
f7c196a1f9 libavdevice: Fix v4l2 compilation under FreeBSD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ffa1f541b350946591ea80e134917b28a860fcad)
2011-12-28 02:10:31 +01:00
Michael Niedermayer
7614facf8a h264: fix init of topleft ref/mv.
Fixes Ticket778

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4d70023a2a83c5c7690708a5a5acfe8ac8ed8f19)
2011-12-18 02:10:59 +01:00
Tomas Härdin
35a42ca0bf mxfdec: Only use the new demuxing logic for OPAtom
This is a stopgap for ticket #746.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:35 +01:00
Michael Niedermayer
de69052b1a ljpeg: Check that lowres is 0 as lowres is not possible with ljpeg.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Michael Niedermayer
bf928ebed2 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>
(cherry picked from commit e1ba29c76430ce511fd901c8b7a1bd199b169dc0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Michael Niedermayer
f52324629a riff: Fix freeing of random value.
Fixes Ticket752
Bug-found-by: Diana Elena Muscalu
(cherry picked from commit 76b9a0961c33c9eb19b220c6f0edfbb3e79fcd59)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Michael Niedermayer
eee78ef30d ffplay: clear pkt_temp when pkt is freed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
(cherry picked from commit efe8a1ba08dd868e5a96f5759258b0733bb2004c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Michael Niedermayer
f600d709f0 ffplay: Fix got_frame type.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
(cherry picked from commit a5a1e3cb8a5f554818c2e491ab4d2cad833a4556)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Panagiotis H.M. Issaris
2a66a65341 ffplay: add 10 minute seek support to ffplay
Signed-off-by: Marton Balint <cus@passwd.hu>
(cherry picked from commit 91a3ea671adda0039c6c221f158a88391416b574)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Marton Balint
964d75735f 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>
(cherry picked from commit 9fb2b412585f94d4a74eb93598b0b1cc3482c189)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Matthieu Bouron
6db6fe82ca mpeg12enc: fix drop_frame_timecode value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 366605ff5dc1471304e8999b8961bc9e4417fc5a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Michael Niedermayer
388e3e7853 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>
(cherry picked from commit eda3758c87dafe8a6179b16e25e60b11746213ad)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Carl Eugen Hoyos
866d5c958f Export ff_vdpau_vc1_decode_picture().
XBMC's configure script checks for this function in installed
libavcodec.so to determine VDPAU support.

Fixes ticket #762 reported by Christian Marillat
(cherry picked from commit 9994643fdd6c06b4f986be8879953a139fbd1a40)
2011-12-16 02:36:51 +01:00
Carl Eugen Hoyos
238c7ffd7d Do not reject LIST tags in wav with size 4.
Fixes ticket #745.
(cherry picked from commit a8e93ce4cb74dc26153bdccfbe8a487674e583a6)
2011-12-14 15:18:11 +01:00
Clément Bœsch
9aaf250fb3 lavfi: skip the frame in case of error.
This fixes playback with some audio files through filters.
(cherry picked from commit 220481e1d6582277ae4c02b05f87251a8670e6cc)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 23:38:02 +01:00
Michael Niedermayer
834aef341d cleanup: for(int
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 16b771b1f47daa9fec84477040984d83a92ba4a6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 21:47:01 +01:00
Michael Niedermayer
657737e58d clenaup: #ifdec CONFIG*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b39e01a6e887745192da8c105ffac1f297b00da9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 21:46:59 +01:00
Michael Niedermayer
b92ef485c7 Fix all GNU %Ld
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9aeaf629038c572073e836277cd1fa981465dd6c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 21:46:45 +01:00
Michael Niedermayer
6289b6c811 twinnvq: remove ;;
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 35f707abe1bd3b80b1951010539285d4c3a14dba)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 21:46:43 +01:00
Michael Niedermayer
849ee7ee82 build: Disable avconv more completely while leaving the user the option to enable it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c83ef636a665b2e17f1b6745a98ec7a5719264df)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 21:46:26 +01:00
Tomas Härdin
5693443446 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>
(cherry picked from commit 89cc8c17dfc2e49d2507eb72bfba10baba372d7f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 21:33:24 +01:00
Tomas Härdin
57111c558e 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>
(cherry picked from commit c0ee522df6c9ef09cdcb5bce7adb4b745aa6485a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 21:33:15 +01:00
Michael Niedermayer
e6a5de4421 ffmpeg: fix codecids with ffserver + ffmpeg + ffm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ee731c1ab071ee51839fd6c2db15dc719349ebb2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-12 18:08:37 +01:00
Michael Niedermayer
b8c41e5c08 fate: replace forgotten avconv by ffmpeg in vsynth / asynth stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 02a01c2fa168fcf3943c81aa0360076dd4856427)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-12 02:05:30 +01:00
Michael Niedermayer
7881dad2b2 seek-test: use standard format specifiers in snprintf()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cd2f7ed0007f4803b6bd845366b2398abb32c355)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-12 02:05:12 +01:00
Michael Niedermayer
9f8d8c57fb update for 0.9
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
n0.9
2011-12-11 21:24:41 +01:00
Michael Niedermayer
16abd68779 seektest: floatfree
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-11 19:21:39 +01:00
Michael Niedermayer
616eaea8ad doc/ffmpeg.texi
Merge changes done to avconv.texi since the last merge into ffmpeg.texi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-11 18:50:39 +01:00
Reimar Döffinger
c3068d43a8 Support VP8 in NSV.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-12-11 18:16:55 +01:00
Michael Niedermayer
a7aa628e9c 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>
2011-12-11 17:52:40 +01:00
Michael Niedermayer
87d781de7a regressiontest: try to fix wtv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-11 16:23:30 +01:00
Clément Bœsch
cc2355817d life: add mold, mold_color, life_color and death_color options. 2011-12-11 14:14:01 +01:00
Clément Bœsch
c88d6b18ce life: add seed information in filter summary. 2011-12-11 13:36:58 +01:00
Stefano Sabatini
6c44ff38d6 lavfi: add cellauto source 2011-12-11 11:55:33 +01:00
Reimar Döffinger
60b252eb57 Add caf format regression test.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-12-11 09:45:17 +01:00
Reimar Döffinger
f22c5bae52 Enable already existing rso regression test.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-12-11 09:45:17 +01:00
Reimar Döffinger
7c875c2d59 Add regression test for "sox" format muxer/demuxer.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-12-11 09:45:17 +01:00
Reimar Döffinger
33a43695c6 Add wtv seek test.
I am not entirely sure the seek functionality is working correctly,
there are some strange cases like successful seek but no dts value.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-12-11 09:45:17 +01:00
Reimar Döffinger
5335bff9ec Add wtv lavf regression test.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-12-11 09:45:17 +01:00
Michael Niedermayer
1f183733e0 MAINTAINERS: extend syntax for entries
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-11 03:05:37 +01:00
Hanspeter Niederstrasser
bed04e2b03 Correct use of OSX to Mac OS X and properly format yasm providers on Mac OS X
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-11 03:00:30 +01:00
Michael Niedermayer
964912aba5 Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
  Warn about avserver being broken.
  avconv: drop code for special handling of avserver streams.
  rawdec: don't set codec timebase.
  lavf doxy: add muxing stuff to lavf_encoding group
  lavf doxy: add demuxing stuff to lavf_decoding group
  lavf doxy: expand/reword metadata API doxy.
  lavf doxy: add installed headers to groups.
  lavf doxy: add avio groups into the lavf_io group.
  lavf doxy: rename lavf I/O group to lavf_io.
  lavf doxy: add metadata docs to the main lavf group
  ttadec: check channel count as read from extradata.
  Add CLJR encoding and decoding regression tests
  cljr: remove unused code
  flacdec: Support for tracks in cuesheet metadata block
  ptx: fix inverted check for sufficient data
  flac muxer: fix writing of file header and STREAMINFO header from extradata
  ptx: emit a warning on insufficient picture data
  utvideo: add fate tests covering all codec variants
  doc: update to refer to avconv
  doc: remove some stale entries from the faq
  ...

Conflicts:
	Changelog
	avconv.c
	doc/avconv.texi
	doc/faq.texi
	doc/ffplay.texi
	doc/ffprobe.texi
	doc/ffserver.texi
	libavcodec/avcodec.h
	libavcodec/cljr.c
	libavformat/avformat.h
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-11 01:05:33 +01:00
Michael Niedermayer
cdba9b617f eval.texi: document that variables are not shared between expressions.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-10 23:36:30 +01:00
Michael Niedermayer
3dea28cc2e h264: Fix concealment regression introduced by babf4fe01a808327d53977ba319c113a930180b1
Limit the new case to when the decoder is flushed instead of at each idr frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-10 23:26:38 +01:00
Michael Niedermayer
8743400961 h264: reset prev_poc_msb to the same value everywhere.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-10 23:03:49 +01:00
Anton Khirnov
2e87b4c511 Warn about avserver being broken.
Also remove mentions of it from other avtools' manuals.
2011-12-10 22:02:44 +01:00