ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-23 23:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,172 Commits 36 Branches 398 Tags 538 MiB
53f903b7c5
Commit Graph

57172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Khirnov
df6737a55f audio_mix: fix channel order in mix_1_to_2_fltp_flt_c 
CC:libav-stable@libav.org
 2013-10-12 15:06:55 +02:00
Michael Niedermayer
8de021fabe Merge remote-tracking branch 'lukaszmluki/master' 
* lukaszmluki/master:
  avformat/ftp: add log regarding passive mode failure
  avformat/ftp: fix possible deadlock
  avdevice/pulse_audio_enc: fix stream index

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 14:14:54 +02:00
Michael Niedermayer
23c8a3353b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  riff: Add a mapping for VP6A

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 14:03:54 +02:00
Lukasz Marek
3a92ee5953 avformat/ftp: add log regarding passive mode failure 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-10-12 13:52:33 +02:00
Lukasz Marek
e1fb3143bb avformat/ftp: fix possible deadlock 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-10-12 13:52:33 +02:00
Lukasz Marek
7b1640c4a6 avdevice/pulse_audio_enc: fix stream index 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-10-12 13:52:26 +02:00
Martin Storsjö
a52b5a5a07 riff: Add a mapping for VP6A 
This allows demuxing VP6A from F4V files.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-10-12 13:02:45 +03:00
Michael Niedermayer
aeddc6e3a5 avfilter/lavfutils: fix memleak of avpacket 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 11:52:10 +02:00
Michael Niedermayer
eedfee12c6 avfilter/vf_removelogo: fix pixel pointer so it points where its intended 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 11:36:55 +02:00
Michael Niedermayer
8c582d1b22 avfilter/vf_removelogo: fix offset for accessing pixels above and below 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 11:35:54 +02:00
Michael Niedermayer
8c0687abdf avfilter/vf_removelogo: use av_freep() for saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 11:31:38 +02:00
Michael Niedermayer
e4d45673ca avformat/movenc: set XDCAM codec tag correctly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 01:42:53 +02:00
Michael Niedermayer
713dcdbfcb avformat/movenc: set pretty compressor name for XDCAM 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 01:42:53 +02:00
Michael Niedermayer
ce994a03f5 avformat/movenc: make AVStream easier to access 
This adds a AVStream pointer to Track

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 01:42:53 +02:00
Timothy Gu
024bf3a1c2 doc/codecs: Add missing mpeg2 aac profiles 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 20:00:06 +02:00
Timothy Gu
1fdae1017c doc/codecs: Add ignorecrop 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 19:59:49 +02:00
Timothy Gu
db4a677433 doc/codecs: Remove no longer existing options 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 19:59:07 +02:00
Timothy Gu
a55e813e53 doc/codecs: Cosmetics in the flags2 description 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 19:57:47 +02:00
Michael Niedermayer
dfb89fee2d doc/codecs: document skip_alpha 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 16:59:32 +02:00
Michael Niedermayer
e7fa0417b3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  prores: Reject negative run and level values

See: 93c220e895
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 16:48:26 +02:00
Stefano Sabatini
f02bab6d09 doc/filters/scale: do not explicitly state the default swscale flags value 
This is done is order to avoid the need of synching scale with libswscale
docs in case the libswscale default changes.
 2013-10-11 16:40:20 +02:00
Carl Eugen Hoyos
a12ab37d1f lavf/riff.c: Fix GeoVision H.264 fourcc. 
Fixes d24da748
 2013-10-11 16:23:09 +02:00
Carl Eugen Hoyos
d24da748c3 Add H.264 fourcc GAVC for GeoVision cameras. 2013-10-11 10:02:00 +02:00
Michael Niedermayer
08b22c0ea5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mxf: Add jpeg2000 codec to intra only codecs

See: c461265a76
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 09:22:10 +02:00
Michael Niedermayer
bb8ce36dc2 Merge commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020' 
* commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020':
  shorten: Fix out-of-array read

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 09:20:26 +02:00
Michael Niedermayer
964f9ca229 Merge commit 'ed796fba761f4794bec7735d467c1b2c8e1858fe' 
* commit 'ed796fba761f4794bec7735d467c1b2c8e1858fe':
  atrac3: Better name for IMDCT window initialization
  atrac3: Remove unused gain compensation tables

See: 2d52834910
See: 4fb8de08e1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 08:23:07 +02:00
Michael Niedermayer
a72bf5fd11 ffmpeg: set the source_index for trivial filter graphs 
Fixes one testcase in Ticket2969

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 00:51:09 +02:00
Luca Barbato
c0de9a23c7 prores: Reject negative run and level values 
Sample-Id: 00000611-google

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-10-10 21:02:10 +02:00
Paul B Mahol
996c73490c avcodec/exr: remove pointless initialization 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-10 18:24:49 +00:00
Maxim Poliakovski
2d52834910 atrac3: Better name for imdct window initialization 
Patch by Diego Biurrun.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 18:33:16 +02:00
Maxim Poliakovski
4fb8de08e1 atrac3: Remove unused gain compensation tables 
Patch by Diego Biurrun.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 18:33:07 +02:00
Matthieu Bouron
054454c63a mxf: Add jpeg2000 codec to intra only codecs 
Conform with SMPTE RP 224 and SMPTE s422.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-10-10 18:22:46 +02:00
Tim Walker
5f5ada3dbf shorten: Fix out-of-array read 
pred_order == FF_ARRAY_ELEMS(fixed_coeffs) is invalid too.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-10-10 17:52:14 +02:00
Michael Niedermayer
a830915b78 swscale: Use full resolution chroma for yuv2rgb when the input has full chroma 
See Ticket3028

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 17:28:59 +02:00
Paul B Mahol
d1d875d301 avfilter/vf_w3fdif: do not reset pts to 0 
Shamelessly stolen from yadif.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-10 15:08:55 +00:00
Michael Niedermayer
cdc9657a0c doc/codecs: Document field_order 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 16:03:37 +02:00
Maxim Poliakovski
ed796fba76 atrac3: Better name for IMDCT window initialization 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-10-10 14:29:54 +02:00
Maxim Poliakovski
be76415047 atrac3: Remove unused gain compensation tables 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-10-10 14:26:13 +02:00
Timothy Gu
7ab8bceabc doc/encoder/aac: Remove -cutoff trick 
Fix Ticket #2686 comment 155.

Trick obsoleted since 72dabdfc58.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 13:43:56 +02:00
Ronald S. Bultje
20d78a8606 libavcodec/x86: Fix emulated_edge_mc SSE code to not contain SSE2 instructions on x86-32. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 13:36:06 +02:00
Michael Niedermayer
ef6b85e9b8 avcodec/proresdec2: propagate error codes 
Based-on: 44690dfa68
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 13:11:54 +02:00
Michael Niedermayer
0391f4617f avcodec/vmnc/reset_buffers(): reset cur_hx/hy too for saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 12:30:52 +02:00
Michael Niedermayer
3fa4c528a9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  prores: Error out only on surely incomplete ac_coeffs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 12:29:17 +02:00
Michael Niedermayer
5c99ca2288 Merge commit '44690dfa683f620c77e9f0e8e9bc5682608636b1' 
* commit '44690dfa683f620c77e9f0e8e9bc5682608636b1':
  prores: Add a codepath for decoding errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 12:21:15 +02:00
Michael Niedermayer
7acb464f0e Merge commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90' 
* commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90':
  flvenc: Write proper cropping for VP6 even if there's no extradata

Conflicts:
	libavformat/flvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 12:06:17 +02:00
Michael Niedermayer
c2555bcbd1 Merge commit 'be1e1373d267bae2af8a62d79eef736736f24565' 
* commit 'be1e1373d267bae2af8a62d79eef736736f24565':
  flvenc: Support muxing VP6A as well

Conflicts:
	libavformat/flvenc.c

See: 42ae83c196
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 11:58:58 +02:00
Michael Niedermayer
0efbd98e23 Merge commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b' 
* commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b':
  flvenc: Don't pretend to support muxing "plain" VP6

Conflicts:
	libavformat/flvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 11:45:45 +02:00
Michael Niedermayer
70025c07a7 Merge commit '41a10f3ba149a2012de499d0b4ad4955d81f28d5' 
* commit '41a10f3ba149a2012de499d0b4ad4955d81f28d5':
  vp6: Support cropping to AVCodecContext.width/height

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 11:38:36 +02:00
Michael Niedermayer
5fcd0a80a2 Merge commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288' 
* commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288':
  avi: directly resync on DV in AVI read failure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 11:31:40 +02:00
Michael Niedermayer
dd0429e1de Merge commit '756547ce7f4d67a18663503e2157aebed3531703' 
* commit '756547ce7f4d67a18663503e2157aebed3531703':
  avi: DV in AVI must be considered single stream

Conflicts:
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 11:22:28 +02:00