Michael Niedermayer
0d6ae06766
Merge commit 'ff48ae94f90f6862dbe5b1e7397a1bda3150e200'
...
* commit 'ff48ae94f90f6862dbe5b1e7397a1bda3150e200':
hlsenc: remove the AVIOContext for the playlist from the muxer context
Conflicts:
libavformat/hlsenc.c
See: 28bf05e7b5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
c0e3b46118
swresample: add av_cold to init functions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Lukasz Marek
e19d1840da
lavf/ffmenc: do not fail on missing codec
...
ffm encoder fails when codec is not found.
It may happen when stream is being copied.
This commit allows to store such stream and provides
backward compatibility with version prior 2.5 release.
fixes #4266
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Hendrik Leppkes
ff48ae94f9
hlsenc: remove the AVIOContext for the playlist from the muxer context
...
Its only used in one function, having it in the context serves no purpose.
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Michael Niedermayer
0a1146a59a
Merge commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b'
...
* commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b':
libavcodec: Don't use av_cold annotation in twinvq header file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
7b7f8d3ed0
Merge commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99'
...
* commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99':
libavresample: Annotate AARCH64 init function with av_cold
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
dc6eadaa45
Merge commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7'
...
* commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7':
rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_a
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
d19ca4b2ea
Merge commit 'a335ed767161c6da2815371177cfd5e40f78e5b7'
...
* commit 'a335ed767161c6da2815371177cfd5e40f78e5b7':
rtpdec_h264: Remove an unnecessary check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
ac7128a90f
Merge commit '176903ce833ce7469f411640e9748a0d549b5285'
...
* commit '176903ce833ce7469f411640e9748a0d549b5285':
rtpdec_h264: Return immediately on errors in h264_handle_packet_stap_a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
48e661b30b
Merge commit 'bb8c6ac840afa69dd37860fdf85da9f4cf1e0ae4'
...
* commit 'bb8c6ac840afa69dd37860fdf85da9f4cf1e0ae4':
rtpdec_h264: Make a parameter pointer const
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
5346b57ee7
Merge commit '7650caf013f45ebebf128855735a0c6350836ea4'
...
* commit '7650caf013f45ebebf128855735a0c6350836ea4':
rtpdec_h264: Use av_realloc instead of av_malloc+mempcy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
2130ed3312
Merge commit '8bdbf49c6f4d9473183a3c45ec70d611eb6183cd'
...
* commit '8bdbf49c6f4d9473183a3c45ec70d611eb6183cd':
rtpdec_h264: Include the right header for AV_RB16
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
de4ae9fb64
Merge commit 'ba2e07909b848e583245856a59d0fe1dd08f917e'
...
* commit 'ba2e07909b848e583245856a59d0fe1dd08f917e':
rtpdec_vp8: Set the keyframe flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
0f55bc29d4
avformat/omadec: Use 64bit for ret to avoid overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
cb08687180
avformat/vqf: Use 64bit for ret to avoid overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
d44e0d8b93
avformat/wtvdec: Use 64bit for ret to avoid overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
26c0cc154e
avformat/mvdec: Use 64bit for ret to avoid overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
80a851aa5e
avformat/apngdec: Use 64bit for ret to avoid overflow
...
Missed this hunk in first commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
12987f8900
avformat/gxf: Use 64bit for res to avoid overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
d1923d15a3
avformat/idcin: Use 64bit for ret to avoid overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
0e3d6e17de
avformat/apngdec: Use 64bit ret to avoid overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
d4936d28a1
avformat/asfdec: Use 64bit ret to avoid overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Rodger Combs
62e95757d5
wtvdec: fix integer overflow resulting in errors with large files
...
This fixes a regression in 9fbc613f0d
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Peter Meerwald
b8d18a9437
libavcodec: Don't use av_cold annotation in twinvq header file
...
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Peter Meerwald
df0891fc8f
libavresample: Annotate AARCH64 init function with av_cold
...
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Martin Storsjö
46ad9ac964
rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_a
...
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Martin Storsjö
a335ed7671
rtpdec_h264: Remove an unnecessary check
...
If src_len is too small for nal_size, we already print a warning
above, and the next step is to check the while loop condition
anyway, so this one serves no purpose.
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Martin Storsjö
176903ce83
rtpdec_h264: Return immediately on errors in h264_handle_packet_stap_a
...
Previously, errors were only logged but the code kept on trying,
and never actually returning the error as a return value.
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Martin Storsjö
bb8c6ac840
rtpdec_h264: Make a parameter pointer const
...
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Martin Storsjö
7650caf013
rtpdec_h264: Use av_realloc instead of av_malloc+mempcy
...
This is similar to what was done for rtpdec_hevc in ced7238cd0
.
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Martin Storsjö
8bdbf49c6f
rtpdec_h264: Include the right header for AV_RB16
...
Including libavcodec/get_bits.h is superfluous for AV_RB16 - nothing
in this file uses any actual bitstream reader.
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Martin Storsjö
ba2e07909b
rtpdec_vp8: Set the keyframe flag
...
This allows the output to be used with stream copy, which discards
packet from the start until the first keyframe.
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Michael Niedermayer
f015d3d539
MAINTAINERS: Add Oleksij as maintainer for DSS*
...
Also add a 2nd maintainer at the authors request (due to lack of time)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Hendrik Leppkes
28bf05e7b5
hlsenc: remove the AVIOContext for the playlist from the muxer context
...
Its only used in one function, having it in the context serves no purpose.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Kevin Wheatley
31c7c0e156
avformat/movenc: Move avid DNxHD padding to the correct spot
...
Outputting DNxHD into .mov containers 'corrupts' following atoms until end of stsd
ffmpeg and qtdump could not decode pasp/colr atoms in the files made by ffmpeg,
when outputting DNxHD due to the incorrect padding placement. Now we add the
padding in the correct place
Tidy up FATE changes due to padding changes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
588361dd26
avcodec/dca: move remaining tables to dcadata
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
6c91afe497
avcodec/snowdec: Fix avmv_index increment
...
Fixes reading uninitialized memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Arwa Arif
627d2a7628
avfilter/vf_eq: Add process_command to eq.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
b11edbd289
avcodec/dss_sp: Avoid a slow division and modulo in the pitch_lag calculation
...
Also check the combined_pitch for validity (which is needed to keep the behavior
identical in the error case)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
31fb029f2d
avcodec/dss_sp: de-obfuscate index inversion
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
4f1c1b26f2
avcodec/dss_sp: Protect DSS_SP_FORMULA() with a set of outside brackets
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
be0cb7e053
avformat/dss: Use av_freep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
b2bbe8298b
avformat/dss: Check sscanf() return value in dss_read_metadata_date()
...
Fixes writing uninitialized values into metadata without error in case
parsing fails
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
29d2197d88
Merge commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c'
...
* commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c':
fate: Add tests for DSS
Conflicts:
tests/fate/audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
e821910a21
Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499'
...
* commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499':
lavf: Add DSS demuxer
Conflicts:
libavformat/Makefile
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
dfe5a9f022
Merge commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b'
...
* commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b':
lavc: Add DSS SP decoder
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
99bcfe6227
Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'
...
* commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23':
qsv_api: fix building with libmfx disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
ac649bb775
Merge commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d'
...
* commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d':
configure: add missing h264_qsv hwaccel deps
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
841e9f431c
Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'
...
* commit '4e08c821106fc1d6d358864abf0d8488b12f38c6':
lavc: add an Intel libmfx-based H.264 decoder
Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
560eb7179a
Merge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49'
...
* commit '31d2039cb42668ebcf08248bc48bbad44aa05f49':
h264_parser: export video format and dimensions
Conflicts:
libavcodec/h264_parser.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago