generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
55,380 Commits 24 Branches 241 Tags 173 MiB
a0fb608396
Commit Graph

55380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
73f940e4d9 Merge commit 'c82da343e635663605bd81c59d872bee3182da73' 
* commit 'c82da343e635663605bd81c59d872bee3182da73':
  pcm: always use codec->id instead of codec_id

This is not merged as we consistently use codec_id, while libav against what
the comit message might hint at mixes both in the decoder.
Its fine to use either but it should be consistent.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-12 14:08:32 +02:00
Michael Niedermayer
0da0caa9a9 Merge commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2' 
* commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2':
  vdpau: use the correct namespace for the union

Conflicts:
	libavcodec/vdpau.h

See: 68dfe530e0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-12 13:47:37 +02:00
Michael Niedermayer
e9348e107b Merge commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446' 
* commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446':
  mlpdec: Do not set invalid context in read_restart_header

Conflicts:
	libavcodec/mlpdec.c

See: a9cd12ee2a

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-12 13:28:40 +02:00
Michael Niedermayer
9d47333e3e Merge commit '2b379a925162b6783bd9a81dc03e647e8b65494c' 
* commit '2b379a925162b6783bd9a81dc03e647e8b65494c':
  mlpdsp: x86: Respect cpuflags

Conflicts:
	libavcodec/x86/mlpdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-12 13:10:53 +02:00
Michael Niedermayer
50617fce07 Merge commit '3abde1a3b49cf299f2aae4eaae6b6cb5270bdc22' 
* commit '3abde1a3b49cf299f2aae4eaae6b6cb5270bdc22':
  pcx: Do not overread source buffer in pcx_rle_decode

Conflicts:
	libavcodec/pcx.c

See: 8cd1c0febe
Bytestream based system is left in place and not switched to buf+end, such switch would be
a step backward

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-12 12:58:13 +02:00
Michael Niedermayer
54bbb90568 Merge commit '170fb593c617cd797d00cf05bfb8d8c21d612893' 
* commit '170fb593c617cd797d00cf05bfb8d8c21d612893':
  pcx: K&R formatting cosmetics

Conflicts:
	libavcodec/pcx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-12 12:36:04 +02:00
Michael Niedermayer
c6953589f9 Merge commit 'ef5b70affc6376bfeadd1ff649b79bad9a124fa8' 
* commit 'ef5b70affc6376bfeadd1ff649b79bad9a124fa8':
  configure: Check for support for labels in the inline assembly

The timer code is not placed under ifdef as ours does not use labels

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-12 12:07:14 +02:00
Michael Niedermayer
bec509db43 vf_interlace: better handling of odd video size 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-12 11:40:56 +03:00
Sean McGovern
52ea298670 fate: use current syntax for the scale filter 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-12 11:08:25 +03:00
Luca Barbato
3802833bc1 dca: Respect the current limits in the downmixing capabilities 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-12 04:34:49 +02:00
Luca Barbato
f261e50845 dca: Error out on missing DSYNC 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-12 04:34:49 +02:00
Luca Barbato
c82da343e6 pcm: always use codec->id instead of codec_id 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-12 04:34:49 +02:00
Luca Barbato
c0d973c41b vdpau: use the correct namespace for the union 
Vdp is used by libvdpau, use AVVDPAU as used for the rest.

Reported-by: Alexis Ballier <aballier@gentoo.org>
 2013-07-12 04:34:49 +02:00
Luca Barbato
e9d394f3fa mlpdec: Do not set invalid context in read_restart_header 
The faulty values rippled further down the codepath causing a
hard-to-track segfault in the assembly code.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-12 04:34:49 +02:00
Luca Barbato
2b379a9251 mlpdsp: x86: Respect cpuflags 2013-07-12 04:34:49 +02:00
Luca Barbato
3abde1a3b4 pcx: Do not overread source buffer in pcx_rle_decode 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-12 04:34:49 +02:00
Luca Barbato
170fb593c6 pcx: K&R formatting cosmetics 2013-07-12 04:34:49 +02:00
Piotr Bandurski
161047f010 rmdec: fix crash in case of oom 
Fixes ticket #2724

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-12 04:24:35 +02:00
Thierry Foucu
38ce775eea libavformat/mov.c: Skipped duplicated MOOV atom 
This should fix ticket 1378
 If we have parsed a moov atom, and found another one, just skip it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-12 02:41:34 +02:00
Carl Eugen Hoyos
0fff7f039c Supply a User-Agent header when opening rtsp streams. 
Some rtsp servers like the IP Cam IcyBox IB-CAM2002 need it.
Fixes ticket #2761.
Reported, analyzed and tested by trac user imavra.
 2013-07-11 23:05:53 +02:00
Dan Flett
43d36599fe lavd/fbdev.c: Support RGB565 input colour space. 
Tested on a Raspberry Pi.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-07-11 18:16:07 +02:00
Martin Storsjö
ef5b70affc configure: Check for support for labels in the inline assembly 
Use this for enabling the ppc timer.h implementation only on
assemblers that support labels in the inline assembly.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-11 18:53:02 +03:00
Michael Niedermayer
0ef40446a8 mjpegdec: print length too in APPx debug code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 16:28:55 +02:00
Michael Niedermayer
8024b4880c avcodec/jpeglsdec: support xfrm 1-3 
Fixes 75% of Ticket893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 16:10:18 +02:00
Michael Niedermayer
96747e6cbe mjpegdec: parse app-xfrm 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 16:08:49 +02:00
Michael Niedermayer
7afa68d37d mjpegdec: parse app-colr 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 16:08:36 +02:00
Michael Niedermayer
531f016944 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  wmavoice: conceal clearly corrupted blocks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 11:50:18 +02:00
Michael Niedermayer
45cc62f0a0 Merge commit 'f5c48f5adaead5259660d4eaab2e695d1bac3a08' 
* commit 'f5c48f5adaead5259660d4eaab2e695d1bac3a08':
  wmavoice: use init_static_data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 11:41:34 +02:00
Michael Niedermayer
5698f6bd73 Merge commit '04e9853a210e07b1a150aa2b8e9af0aa3601ff21' 
* commit '04e9853a210e07b1a150aa2b8e9af0aa3601ff21':
  wmavoice: return meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 11:33:19 +02:00
Michael Niedermayer
2efc2b53be Merge commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9' 
* commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9':
  iff: Do not read over the source buffer

Conflicts:
	libavcodec/iff.c

See: 2fbb37b51b

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 11:32:36 +02:00
Michael Niedermayer
56090b5b80 Merge commit '3865ba7b21aef5d60183719e238361ec8797ab5a' 
* commit '3865ba7b21aef5d60183719e238361ec8797ab5a':
  iff: K&R formatting cosmetics

Conflicts:
	libavcodec/iff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 11:12:48 +02:00
Michael Niedermayer
15cee5e562 mjpegdec: Fix used quant index for gbr 
Fixes Ticket1651

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 02:31:58 +02:00
Michael Niedermayer
94e86ae15a mjpegdec: initialize source variables before gbr remap 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-11 02:31:58 +02:00
Stefano Sabatini
71a2e5245c lavf/segment: use AV_OPT_TIME_DURATION for time_delta 
Simplify.
 2013-07-11 00:36:53 +02:00
Stefano Sabatini
459dc81a64 lavf/segment: reindent after last commit 2013-07-11 00:36:41 +02:00
Stefano Sabatini
19ea08a11a lavf/segment: add initial_offset option 
Should address trac ticket #2224.
 2013-07-11 00:36:24 +02:00
Stefano Sabatini
b3ac8a2a60 doc/formats: add section describing stream specifiers 2013-07-11 00:35:35 +02:00
Stefano Sabatini
e7a6962e76 doc/developer: update sections about external development 
Replace the sections "API" and "Integrating libavcodec or libavformat"
with updated / more accurate text.

See thread:
Subject: [FFmpeg-devel] [PATCH] doc/developer: merge and update sections about external development
Date: Fri,  5 Jul 2013 11:07:07 +0200
 2013-07-11 00:01:19 +02:00
Paul B Mahol
db4e191d88 lavfi/aevalsrc: do not free AVOption variables in uninit() 
The generic code frees them already.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 19:22:07 +00:00
Paul B Mahol
badbd2414d lavfi/aevalsrc: use AV_OPT_TYPE_DURATION 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 19:16:00 +00:00
Paul B Mahol
1e89f74902 lavfi/afade: use av_rescale() 
Should not make a difference, but its good idea.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 19:13:28 +00:00
Derek Buitenhuis
2ea60971dc fate: Always enable avresample 
There's no reason we shouldn't be testing it.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-07-10 15:12:05 -04:00
Paul B Mahol
4511973901 wmalosslessdec: do not set avctx->coded_frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-10 19:11:12 +00:00
Michael Niedermayer
07206deed1 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Suggest recompilation with openssl or gnutls if the https protocol is not found.
  lavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 19:58:19 +02:00
Michael Niedermayer
0a3a0edd52 avfilter/af_earwax: Fix out of array accesses on odd packets 
Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 16:46:13 +02:00
Michael Niedermayer
8f09957194 avcodec/qdm2: initialize sign_bits 
Fixes non deterministic output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 16:21:33 +02:00
Carl Eugen Hoyos
1db88c33f2 Suggest recompilation with openssl or gnutls if the https protocol is not found. 
Fixes ticket #2765.
 2013-07-10 16:20:40 +02:00
Carl Eugen Hoyos
c9eb5c9751 lavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation. 2013-07-10 16:20:40 +02:00
Michael Niedermayer
fbe159e850 avcodec/qdm2: store bits in an integer instead of float variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 16:18:52 +02:00
Piotr Bandurski
b050956334 avformat/utils: avformat_find_stream_info set value for ret in case of oom 
without it FFmpeg didn't display any error message when oom event occured

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 16:07:45 +02:00