RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
48,802 Commits 36 Branches 392 Tags 307 MiB
Commit Graph

48802 Commits

Author SHA1 Message Date
Michael Niedermayer 1700be5855 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  oggdec: make sure the private parse data is cleaned up

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 14:20:21 +01:00
Michael Niedermayer 2db8660f09 Merge commit '89b51b570daa80e6e3790fcd449fe61fc5574e07' 
* commit '89b51b570daa80e6e3790fcd449fe61fc5574e07':
  oggdec: free the ogg streams on read_header failure

Conflicts:
	libavformat/oggdec.c

Original commit this was based on: (this merge just moves the function up)
commit 07a866282f
Author: Michael Niedermayer <michaelni@gmx.at>
Date:   Tue Nov 20 15:12:37 2012 +0100

    oggdec: fix memleak on header parsing failure

    Fixes Ticket1931

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 14:03:48 +01:00
Benjamin Larsson bbae68596e xwma: Remove unused variable 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-01-07 13:25:20 +01:00
Peter Ross 8b4842c2e2 wtvdec: warn about truncated files 2013-01-07 23:14:58 +11:00
Peter Ross 801b636633 wtvenc: mux thumbnail picture 2013-01-07 23:14:58 +11:00
Peter Ross 361ecb6176 wtvdec: ignore WM/MediaThumbType metadata entry 
This tag is used by Windows Media Centre in displaying the thumbnail,
and should be transformed into FFmpeg metadata string.
 2013-01-07 23:14:58 +11:00
Peter Ross 508836932f wtvdec: demux thumbnail picture to AVStream.attached_pic 2013-01-07 23:14:58 +11:00
Paul B Mahol 2a89081cad Add EVRCA and SMV codec id 
Demuxing files should be possible even if there are
no decoding support in lavc (yet).

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-07 11:43:20 +00:00
Peter Ross 6cff56f0ba frmdec: tag 2 is AV_PIX_FMT_RGB0 2013-01-07 22:06:06 +11:00
Peter Ross 8d4c817c4a frmdec: terminate frm_pix_fmt_tags 2013-01-07 22:06:06 +11:00
Peter Ross f2dc158b0a frmdec: use AV_PIX_FMT_xxx 2013-01-07 22:06:06 +11:00
Paul B Mahol 2516023695 012v: remove double ; and return correct error code if ff_get_buffer() fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-07 10:48:02 +00:00
Paul B Mahol 7f7f31bfcb iff: support seeking with maud 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-07 10:19:49 +00:00
Paul B Mahol 3174137d41 w64: fact guid support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-07 10:08:38 +00:00
Paul B Mahol e13c5abbd7 Changelog: move Megalux where it belongs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-07 09:45:45 +00:00
Diego Biurrun e817d9139f asfdec: Fix printf format string length modifier 2013-01-07 09:21:42 +01:00
Michael Niedermayer 92e79e595b Merge remote-tracking branch 'qatar/master' 
Merge only for metadata, no commits merged

* qatar/master:
  Drop Snow codec
  Prepare for 10_alpha1 Release

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 02:01:39 +01:00
Michael Niedermayer c526a01c91 Merge commit '4f50646697606df39317b93c2a427603b77636ee' 
* commit '4f50646697606df39317b93c2a427603b77636ee':
  x86: sbrdsp: Implement SSE qmf_post_shuffle

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:51:10 +01:00
Michael Niedermayer 8429320313 Merge commit '44a0036d10579ed91e48df24859e54b08a582742' 
* commit '44a0036d10579ed91e48df24859e54b08a582742':
  x86: sbrdsp: Implement SSE sum64x5

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:40:05 +01:00
Michael Niedermayer ea93ccf079 Merge commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0' 
* commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0':
  x86: ABS1: port to cpuflags
  v210x: cosmetics, reformat

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:35:18 +01:00
Michael Niedermayer 55d8cac254 Merge commit '6689474b91049411b5b7986616d1c66b701ae11f' 
* commit '6689474b91049411b5b7986616d1c66b701ae11f':
  v210x: return meaningful error codes.
  r210dec: return meaningful error codes.
  vb: cosmetics, reformat

Conflicts:
	libavcodec/vb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:30:23 +01:00
Michael Niedermayer 501db2f32b Merge commit '9dbbda235d93d628777b986e502213f1ed390973' 
* commit '9dbbda235d93d628777b986e502213f1ed390973':
  vb: return meaningful error codes.
  ptx: return meaningful error codes.
  tiff: return meaningful error codes.
  vqavideo: return meaningful error codes.
  mss2: return meaningful error codes.
  v210dec: return meaningful error codes
  indeo2: cosmetics, reformat

Conflicts:
	libavcodec/indeo2.c
	libavcodec/tiff.c
	libavcodec/v210dec.c
	libavcodec/vb.c
	libavcodec/vqavideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:24:32 +01:00
Michael Niedermayer 4b20d307b3 Merge commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8' 
* commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8':
  indeo2: check decoding errors.
  indeo2: return meaningful error codes
  rl2: cosmetics, reformat

Conflicts:
	libavcodec/rl2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:11:14 +01:00
Michael Niedermayer d30660306c Merge commit '3c6e5a840c45fd3b832e86881602a72e47d46f19' 
* commit '3c6e5a840c45fd3b832e86881602a72e47d46f19':
  rl2: use fixed-width integer types where appropriate
  rl2: return meaningful error codes.
  cljr: return a meaningful error code.
  fraps: cosmetics, reformat

Conflicts:
	libavcodec/fraps.c
	libavcodec/rl2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 01:01:13 +01:00
Michael Niedermayer 07f22d0b49 Merge commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4' 
* commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4':
  fraps: return meaningful error codes.
  kgv1dec: return meaningful error codes.
  kmvc: return meaningful error codes.
  wnv1: return meaningful error codes.
  dpx: return meaningful error codes.
  truemotion1: return meaningful error codes
  pnm: return meaningful error codes.

Conflicts:
	libavcodec/dpx.c
	libavcodec/fraps.c
	libavcodec/kmvc.c
	libavcodec/pnm.c
	libavcodec/pnmdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 00:41:06 +01:00
Michael Niedermayer 7b018e5c8d Merge commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4' 
* commit '84f2847de394ac447f53306bd4dd73e1af6ea5e4':
  xl: return a meaningful error code.
  xan: return a meaningful error code.
  xxan: return meaningful error codes.
  zmbv: return more meaningful error codes.
  yop: use a meaningful error code.
  c93: return meaningful error codes.
  bmv: return meaningful error codes.
  bmp: return meaningful error codes.
  bink: operate with pointers to AVFrames instead of whole structs.
  bink: return meaningful error codes.
  bfi: return meaningful error codes.
  bethsoftvideo: return meaningful error codes.

Conflicts:
	libavcodec/c93.c
	libavcodec/xl.c
	libavcodec/xxan.c
	libavcodec/yop.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 23:59:35 +01:00
Michael Niedermayer 6190446745 Merge commit 'e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355' 
* commit 'e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355':
  avs: return meaningful error codes.
  aura: return meaningful error codes.
  asvdec: return meaningful error codes.
  ansi: return a meaningful error code
  anm: return meaningful error codes
  aasc: return meaningful error codes.
  8bps: return meaningful error codes.
  4xm: operate with pointers to AVFrames instead of whole structs.
  4xm: eliminate a pointless indirection

Conflicts:
	libavcodec/4xm.c
	libavcodec/aasc.c
	libavcodec/anm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 23:48:48 +01:00
Michael Niedermayer a2aeaff40f Merge commit 'aa15afb7ce850e2ac688efdef189df5da817a646' 
* commit 'aa15afb7ce850e2ac688efdef189df5da817a646':
  4xm: simplify code with FFSWAP
  4xm: return meaningful error codes

Conflicts:
	libavcodec/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 23:41:19 +01:00
Michael Niedermayer 58edabb198 MAINTAINERS: add 1.1, remove 0.10 
If someone else wants to maintain a old release, please contact us

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 21:42:35 +01:00
Michael Niedermayer d46fca4b75 RELEASE: 1.1.git for master 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 21:42:35 +01:00
Michael Niedermayer 6270564abc Changelog, update for 1.1 release 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 21:28:15 +01:00
Michael Niedermayer 2713e43ac8 ff_get_audio_frame_size: try to fix wma in wav 
Fixes Ticket1905, Ticket2114

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 19:46:04 +01:00
Stefano Sabatini b3d814753c tests/fate/avfilter.mak: merge pp tests into GPL test list 
The mp=pp filter was removed and replaced with a native implementation,
so the dependency on CONFIG_MP_FILTER stands no more.
 2013-01-06 19:04:24 +01:00
Clément Bœsch caee85bbce lavfi/kerndeint: remove unused pixel_step. 2013-01-06 18:59:15 +01:00
Clément Bœsch f6659e5c5e lavfi/kerndeint: fix temp buffer linesize. 
Also re-enable the FATE test.
 2013-01-06 18:59:15 +01:00
Carl Eugen Hoyos 1ae9d2820e Support decoding AC-3 in wav. 
All known samples are actually ac3-in-spdif-in-wav, so use
the spdif demuxer to get the ac3 frames.
 2013-01-06 18:48:51 +01:00
Luca Barbato d894f74762 oggdec: make sure the private parse data is cleaned up 2013-01-06 17:59:54 +01:00
Luca Barbato 89b51b570d oggdec: free the ogg streams on read_header failure 
Plug an annoying memory leak on broken files.
 2013-01-06 17:59:54 +01:00
Carl Eugen Hoyos 9ff92cf195 012v decoder. 
The decoder also supports a12v, but removes the transparency layer
since no samples with actual transparency are available for testing.
 2013-01-06 17:59:27 +01:00
rogerdpack 40648d8cc3 add note on windows pipe 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 17:47:49 +01:00
Michael Niedermayer f6ef62eb7f doc/ffmpeg-resampler: Try to document async 
Improvements welcome!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 17:47:49 +01:00
Carl Eugen Hoyos 9ffe790afc Support stereo as experimental feature in mmf / Yamaha SMAF. 
Fixes ticket #1085.
 2013-01-06 16:38:24 +01:00
Diego Biurrun a0c5917f86 Drop Snow codec 
Snow is a toy codec with no real-world use and horrible code.
 2013-01-06 16:30:02 +01:00
Reinhard Tartler 6b8d88808d Prepare for 10_alpha1 Release 2013-01-06 16:23:12 +01:00
Michael Niedermayer 631ec0642d fate: disable kerndeint test 
The filter has been added recently and does not yet pass tests on all platforms.
It should not be included in the tests in the release until it works.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 15:08:38 +01:00
Michael Niedermayer 8214c1d82c mxfenc: avoid depending on private codec structures and functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 14:08:08 +01:00
Michael Niedermayer 3db02b83e7 dnxhd: Add avpriv_dnxhd_get_frame_size() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 13:58:46 +01:00
Christophe Gisquet 4f50646697 x86: sbrdsp: Implement SSE qmf_post_shuffle 
255 to 174 cycles on Arrandale / Win64. Unrolling yields no gain.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-01-06 13:57:01 +01:00
Christophe Gisquet 44a0036d10 x86: sbrdsp: Implement SSE sum64x5 
698 to 174 cycles on Arrandale. Unrolling is a 6 cycles gain.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-01-06 13:57:01 +01:00
Diego Biurrun 5b4dfbffc2 x86: ABS1: port to cpuflags 2013-01-06 13:57:01 +01:00