Michael Niedermayer
8c5fece11f
Merge commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6'
...
* commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6':
aacdec: set AVFrame sample_rate
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
1bc3f1b73d
Merge commit '4a7d3837b4dd17fff270b55166597c093204e542'
...
* commit '4a7d3837b4dd17fff270b55166597c093204e542':
buffersrc: Have function parameter names match between .c and .h file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
74744790a3
Merge commit '25a1ba814ad80056247fd357ec4c6911324a3f66'
...
* commit '25a1ba814ad80056247fd357ec4c6911324a3f66':
log: Have function parameter names match between .c and .h file
Conflicts:
libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Derek Buitenhuis
50ea93158d
Add libx265 encoder
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Derek Buitenhuis
bb6b1731eb
Add libx265 encoder
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Janne Grunau
f5d92d9cab
asfdec: fix seeking with fragmented packets
...
After seeking fragments with an offset > 0 must be skipped to correctly
assemble packets.
Bug-Id: 43
11 years ago
Andrew Kelley
0c08256596
asfdec: short-circuit seeking to the start of stream
...
Bug-id: 43
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
11 years ago
Janne Grunau
0ebb523f07
asfdec: check ff_get_guid() return values during seeking
...
Hitting EOF during seeking is quite likely. Fixes use of uninitialized
data during fate-seek-lavf-asf.
11 years ago
John Stebbins
462d5e8e6c
aacdec: set AVFrame sample_rate
...
AVFrame.sample_rate is set in ff_get_buffer, but aacdec calls
ff_get_buffer before the samplerate is known. So it needs to be
set again before returning the frame.
11 years ago
Diego Biurrun
4a7d3837b4
buffersrc: Have function parameter names match between .c and .h file
...
This fixes two related Doxygen warnings. Also document one parameter.
11 years ago
Diego Biurrun
25a1ba814a
log: Have function parameter names match between .c and .h file
...
This fixes two related Doxygen warnings.
11 years ago
Clément Bœsch
b6c0f07d5a
avfilter/lut3d: inline whole loop in interpolation function.
...
84 → 92 fps here.
11 years ago
Michael Niedermayer
a0911b0597
avformat/mov: fix keyframe flags for sample from chromium Issue 340865
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
058a3d6542
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavf/lavd: version bump and APIchanges for uncoded frames.
tools: add uncoded_frame test program.
lavf: add uncodedframecrc test muxer.
lavd/xv: preliminary support of uncoded frame.
lavd/alsa: preliminary support of uncoded frame.
lavf: add write_uncoded_frame() API.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c33351f3e7
avcodec/mpegaudio_parser: Delay setting codec_id if it appears wrong
...
Fixes mp1/mp3 in mp4 misdetection
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5669ae8401
avcodec/mpegaudio_parser: treat codec_id like the other parameters
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d3068d25ca
avcodec: Add avpriv_mpa_decode_header2()
...
The difference to avpriv_mpa_decode_header() is that it doesnt need or modify the context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
707a07f3c2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavc: set AVFrame pkt_pts and reordered_opaque in reget_buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
bde58d9901
Merge commit '6477449243db4aab15a4db356e8354c60b5366ec'
...
* commit '6477449243db4aab15a4db356e8354c60b5366ec':
g2meet: make JPEG tile decoder operate on 8x8 block mask
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
852dcf336b
Merge commit 'd6d78518018a12fb495baab5663708a830f3aab6'
...
* commit 'd6d78518018a12fb495baab5663708a830f3aab6':
g2meet: factor out seeking to the chunk end
Conflicts:
libavcodec/g2meet.c
See: 3f826039dd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
John Stebbins
52771346dc
lavc: set AVFrame pkt_pts and reordered_opaque in reget_buffer
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Kostya Shishkov
6477449243
g2meet: make JPEG tile decoder operate on 8x8 block mask
...
This is needed for upcoming Go2Meeting (G2M2/G2M3) decoder.
11 years ago
Maxim Poliakovski
d6d7851801
g2meet: factor out seeking to the chunk end
...
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
11 years ago
Nicolas George
edc7e67669
lavf/lavd: version bump and APIchanges for uncoded frames.
11 years ago
Nicolas George
8400368f31
tools: add uncoded_frame test program.
11 years ago
Nicolas George
dcda5ef1ea
lavf: add uncodedframecrc test muxer.
11 years ago
Nicolas George
d201a0f0f8
lavd/xv: preliminary support of uncoded frame.
11 years ago
Nicolas George
62106fcc23
lavd/alsa: preliminary support of uncoded frame.
11 years ago
Nicolas George
1b05ac220e
lavf: add write_uncoded_frame() API.
11 years ago
James Almer
6c12b1de06
x86: add missing XOP checks and macros
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Marton Balint
8e41240047
lavfi/frei0r: load plugins from lib64 folders as well on 64bit builds
...
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Matt Oliver
1ff42685fe
avformat/libssh: Fix libssh defaulting to shared linkage.
...
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com>
See: [FFmpeg-devel] Fix libssh static linkage on Windows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8f92edf6f8
avcodec/ra144: remove redundant AV_ZERO128
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Christophe Gisquet
c3390fd56c
ra144: use scalarproduct_int16
...
The buffer holding the coefficients must be padded with 0 so as to use DSP
functions that may overread. Currently, the SSE2/3 versions is an example,
as they process batches of 16 bytes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
dfc99ca04d
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rpza: limit the number of blocks to the total remaining blocks in the frame
See: 3819db745d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
996fdca8fb
Merge commit 'a46dc49744bdc4f2e31725b63ac8e41f701e4fa1'
...
* commit 'a46dc49744bdc4f2e31725b63ac8e41f701e4fa1':
rpza: move some variables to the blocks where they are used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
0a4311dee5
Merge commit 'c7769df178fd670156f1c11f6c8410ddd59bbfee'
...
* commit 'c7769df178fd670156f1c11f6c8410ddd59bbfee':
rpza: use fixed-width int types
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8b0befe451
Merge commit 'e1218ce9149aad0ae9770a32a78d77ad2210bd64'
...
* commit 'e1218ce9149aad0ae9770a32a78d77ad2210bd64':
rpza: switch to bytestream2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
3868e97c6b
ffmpeg: fix vstats
...
Broken by: 394fb56c29
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8560fdc451
Merge commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703'
...
* commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703':
lavf: always unref the packet passed to av_interleaved_write_frame() on error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e93674c4a3
doc/APIchanges: fill in FFmpeg hashes & versions
...
Entries that have no hash at all are not filled in
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Zhang Rui
4958628ba6
avformat/concatdec: pass the interrupt callback on
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Anton Khirnov
77bb0004bb
rpza: limit the number of blocks to the total remaining blocks in the frame
...
Fixes invalid writes.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
11 years ago
Anton Khirnov
a46dc49744
rpza: move some variables to the blocks where they are used
11 years ago
Anton Khirnov
c7769df178
rpza: use fixed-width int types
11 years ago
Anton Khirnov
e1218ce914
rpza: switch to bytestream2
11 years ago
Anton Khirnov
394fb56c29
lavf: always unref the packet passed to av_interleaved_write_frame() on error
11 years ago
Michael Niedermayer
1c1bb203dd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
build: fix examples compilation when EXESUF is not empty
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ec8e232b53
Merge commit '18c896be3d8e926ef806e7de29c4a168d7763389'
...
* commit '18c896be3d8e926ef806e7de29c4a168d7763389':
lavf: extend / improve the AVFormatContext doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c84280b09c
Merge commit '54f7e79d4706a8343dad1d8da51b7d3d3b2cd3b2'
...
* commit '54f7e79d4706a8343dad1d8da51b7d3d3b2cd3b2':
lavf: add some basic documentation of the muxing process
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago