ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-23 06:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,285 Commits 36 Branches 398 Tags 535 MiB
5ab7b3b948
Commit Graph

56285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Almer
5ab7b3b948 matroskadec: Mute "Unknown entry" log messages for CueRelativePosition entries 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-15 12:57:19 +02:00
Michael Niedermayer
61b3b58720 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mem: Document the non-compatibility of av_realloc() and av_malloc()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-15 11:57:02 +02:00
Timothy Gu
81bbe49a0e doc/encoders: improve libvo-aacenc doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-09-15 11:35:32 +02:00
Timothy Gu
0e11790cf7 doc/encoders: add doc for AAC encoder 
Thanks-to: Kostya Shishkov <kostya.shishkov@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-09-15 11:35:17 +02:00
Michael Niedermayer
529540759f avcodec/simple_idct_template: adjust coeffs for 12bit idct 
This prevents overflows with 12bit jpegs
Fixes Ticket2952

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-15 03:21:03 +02:00
James Almer
d59213b5d3 matroskaenc: Bump DocTypeVersion to 4 
The muxer has been creating files with v4 elements for some time now,
and especially now that we can mux non-experimental Opus files, reporting
the DocTypeVersion as 2 is not correct.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-15 02:08:15 +02:00
Dave Rice
2fcef19c38 Adding a line to Changelog about FFV1 version 1.3 now being stable 
FFV1 version 1.3 is non-experimental as of Aug 26, 2013. Adding that to the changelog.

Signed-Off By: dericed <dave@dericed.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-14 23:16:57 +02:00
Paul B Mahol
f2afe96181 avformat/nutenc: use av_reallocp_array() 
Fixes memleak on allocation error.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-14 16:14:43 +00:00
Paul B Mahol
6a70feadb0 avformat/nutenc: use av_calloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-14 16:14:43 +00:00
Diego Biurrun
9997a812e7 mem: Document the non-compatibility of av_realloc() and av_malloc() 2013-09-14 17:38:01 +02:00
Piotr Bandurski
1a3d142f1f avcodec/bfi: check for malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-14 17:35:48 +02:00
Piotr Bandurski
bb5e7d3b5a avcodec/mationpixels: free memory after malloc failures 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-14 17:35:48 +02:00
Paul B Mahol
7d8939a0ff avfilter/avf_avectorscope: improve description 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-14 12:11:22 +00:00
Paul B Mahol
8134edf3eb avcodec/cdxl: use av_freep() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-14 10:45:14 +00:00
Piotr Bandurski
8728360b56 avcodec/mationpixels: check for malloc failures 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-14 04:12:21 +02:00
Alexey Balekhov
90ca814267 ffserver: allow choosing the pixel format 
Fixes Ticket2954

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-14 03:51:45 +02:00
Michael Niedermayer
108b91c3fe avcodec/mpeg12dec: clear mpeg_enc_ctx_allocated when contexts are deallocated 
Fixes Ticket2950

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-14 00:31:40 +02:00
Michael Niedermayer
6c07e41f43 avcodec/mjpegdec: check for malloc failure of blocks[] and last_nnz[] 
Fixes null pointer dereference
Fixes Ticket2947

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-13 23:25:16 +02:00
Paul B Mahol
23bd0335af avcodec/g2meet: remove redundant log message 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-13 20:41:12 +00:00
Paul B Mahol
3dcd3e08f6 avcodec/proresdec2: remove duplicated tables 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-13 19:28:10 +00:00
Paul B Mahol
b8b398027c avfilter/video: remove commented out cruft 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-13 19:17:56 +00:00
Michael Niedermayer
f3ba91a3f1 avutil/pixdesc: dont try to use av_read_image_line() with bayer formats 
It has undefined behavior ATM as its not supported.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-13 20:51:41 +02:00
Michael Niedermayer
a25585bb50 avutil/pixdesc: Prevent minor array overread in ff_check_pixfmt_descriptors() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-13 20:51:04 +02:00
Michael Niedermayer
fc477263fa Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  pcm-dvd: Minor leftovers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-13 13:48:43 +02:00
Michael Niedermayer
3c89ec2816 Merge commit 'd9cdb7d8d6d828bb5497ea3f0fd7edd2f3f6cc30' 
* commit 'd9cdb7d8d6d828bb5497ea3f0fd7edd2f3f6cc30':
  pcm-dvd: Support channel configuration changes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-13 13:43:13 +02:00
Christian Schmidt
aca25104ea pcm-dvd: Minor leftovers 
Drop a pointless branch in uninit and use the compact copyright.
 2013-09-13 12:14:05 +02:00
Christian Schmidt
d9cdb7d8d6 pcm-dvd: Support channel configuration changes 
The sample buffering logic does not take into account that the blocksize
could change. Reset the buffer if the channel configuration changes,
since if there are leftover samples, it is most likely a broken or
misconcatenated stream. This could lead to negative numbers for
missing_samples during decoding.

Thanks to Michael Niedermeyer for pointing these out.
 2013-09-13 12:14:05 +02:00
Michael Niedermayer
126ba68826 avfilter/vf_noise: rename linesize to bytewidth 
Its the width in bytes and not the linesize or stride.
This makes the naming more consistent with the rest of the codebase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-13 11:51:37 +02:00
Michael Niedermayer
53102fa2f0 Revert "avfilter/vf_noise: dont corrupt the picture outside width x height" 
This reverts commit 51dab60c7b.

this fixed nothing, and was just the result of assuming that the
variable named linesize was the linesize. Its not, its the width
in bytes which was already correct.

Found-by: durandal_1707
 2013-09-13 11:51:37 +02:00
Georg Martius
ad96482d67 avfilter/vidstabtransform: allow negative zoom. 
This is useful in addition to crop=black.

Signed-off-by: Clément Bœsch <clement@stupeflix.com>
 2013-09-13 11:46:44 +02:00
Vignesh Venkatasubramanian
b7bd68853d lavf/matroska: Removing experimental suffix for Opus 
Removing the /EXPERIMENTAL suffix for codec id field for Opus. Doing this
as the implementation of embedding Opus in Matroska is complete.

Signed-Off By: Vignesh Venkatasubramanian <vigneshv@google.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 23:55:29 +02:00
Vignesh Venkatasubramanian
1d0d2201b4 Adding a line to Changelog about Opus Matroska Support 
Next release of ffmpeg will support embedding Opus in Matroska
container. Adding that to the Changelog.

Signed-Off By: Vignesh Venkatasubramanian <vigneshv@google.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 23:55:28 +02:00
Michael Niedermayer
e2774b3e3b Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Set bits_per_raw_sample when reading j2k frames.
  libopenjpegdec.c: Correctly scale gray16 output if precision < 16
  Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10.
  Store the video bit_rate in the context when muxing mxf.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 22:19:46 +02:00
Paul B Mahol
1b99514dfd avcodec/smacker: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-12 16:34:54 +00:00
Michael Niedermayer
16837f9846 avcodec/aacenc: use enum for aac coder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 17:25:30 +02:00
Timothy Gu
5748e24950 aacenc: use constants to set AAC coder 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 17:22:48 +02:00
Timothy Gu
4bd910d83d aacenc: add AAC_CODER_(FAAC|ANMR|etc.) macros 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 17:22:36 +02:00
Michael Niedermayer
bfe1445871 avcodec/aic: fix "warning: comparison of unsigned expression < 0 is always false" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 17:14:55 +02:00
Michael Niedermayer
51dab60c7b avfilter/vf_noise: dont corrupt the picture outside width x height 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 17:14:54 +02:00
Paul B Mahol
3eba83daed avfilter/vf_noise: unbreak filter when inline assembly is not present 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-12 14:54:10 +00:00
Michael Niedermayer
f144168d9b avcodec/smacker: fix some memleaks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 16:17:32 +02:00
Michael Niedermayer
fbab9a7c22 avcodec/smacker: remove check that has become redundant 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 16:17:32 +02:00
Michael Niedermayer
59a08d1939 avcodec/smacker: use the correct field instead of a hardcoded value for the index check in smacker_decode_tree() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 16:17:32 +02:00
Michael Niedermayer
d2d96f9e47 vformat/smacker: use av_freep() to ensure no stale pointers remain 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 16:17:32 +02:00
Paul B Mahol
b211607b5c avfilter: various cosmetics 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-12 14:01:43 +00:00
Michael Niedermayer
ba5e77814e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  matroskaenc: Fix stray pointers left over from av_reallocp_array refactoring

Conflicts:
	libavformat/matroskaenc.c

Mostly not merged as the buggy code was no longer part of FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 15:26:06 +02:00
Stefano Sabatini
52ed1d6d58 MAINTAINERS: move sections from lavc to lavu 
Reflect current code organization.
 2013-09-12 15:17:11 +02:00
Michael Niedermayer
44fb7de8ee Merge commit 'c0779a67e85df856904ee6fab760c4233d4c2be5' 
* commit 'c0779a67e85df856904ee6fab760c4233d4c2be5':
  mp3: add .mpa extension

Conflicts:
	libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 15:02:23 +02:00
Michael Niedermayer
07f6a3d787 Merge commit 'e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984' 
* commit 'e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984':
  configure: Mention that icl does not build both static and shared libs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 14:57:23 +02:00
Michael Niedermayer
fa9e8bafc8 Merge commit 'b1e469885362febce3d9a4678624e44a92f77da9' 
* commit 'b1e469885362febce3d9a4678624e44a92f77da9':
  g2meet: Allocate cursor buffers large enough to fit the aligned width

See: 3c4c5ca1c1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 14:48:55 +02:00