Michael Niedermayer
b8cdf04726
Merge commit '1173320249745eab01c901a39054fc0fced33c87'
...
* commit '1173320249745eab01c901a39054fc0fced33c87':
dsputil: Drop unused bit_depth parameter from all init functions
Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Diego Biurrun
1173320249
dsputil: Drop unused bit_depth parameter from all init functions
11 years ago
Paul B Mahol
6779bf3f0f
avformat/wavenc: use av_mallocz_array()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Michael Niedermayer
c6c172d173
avformat/mpegts: skip updating programs/streams when determining duration
...
Fixes Ticket2441
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c9d64abedf
avfilter/vf_decimate: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
be55518fdb
avfilter/vf_deshake: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
4932b1e8b8
avfilter/vf_libopencv: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
375d7ee805
Merge commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e'
...
* commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e':
mov: Clarify tkhd flag settings
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
4c91599484
Merge commit 'f90729699db9ede2bef2b28000f1795dab1b8996'
...
* commit 'f90729699db9ede2bef2b28000f1795dab1b8996':
mov: Do not group tracks if more than one is enabled per type
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e1f4397e74
Merge commit '458e7c94830d1522997e33a0b5e87bd709e8a349'
...
* commit '458e7c94830d1522997e33a0b5e87bd709e8a349':
hevc: implement pic_output_flag handling
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_refs.c
See: 2eddf3a6ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
aa56c37c8a
Merge commit 'f43789b76e661acd93c21664678f140e53cfa1fa'
...
* commit 'f43789b76e661acd93c21664678f140e53cfa1fa':
hevc: set the keyframe flag on output frames
See: e2760de605
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
673a2b3818
Merge commit '1493b237bd3f9707319ac58d315ce45312900c10'
...
* commit '1493b237bd3f9707319ac58d315ce45312900c10':
hevc: Replace nal type chek with equivalent IS_IRAP macro
Conflicts:
libavcodec/hevc.c
See: e2760de605
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f351afb5f9
Merge commit '17e9d52c8c93f47721ff481b8867922f4b4bd663'
...
* commit '17e9d52c8c93f47721ff481b8867922f4b4bd663':
hevc_ps: remove a write-only variable
Conflicts:
libavcodec/hevc_ps.c
See: ba70563d55
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Luca Barbato
df2aa22203
mov: Clarify tkhd flag settings
11 years ago
Luca Barbato
f90729699d
mov: Do not group tracks if more than one is enabled per type
...
The specification requires at most 1 track enabled per alternate group.
11 years ago
Gildas Cocherel
458e7c9483
hevc: implement pic_output_flag handling
...
Sample-Id: OPFLAG_B_Qualcomm_1.bit, OPFLAG_C_Qualcomm_1.bit
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Mickaël Raulet
f43789b76e
hevc: set the keyframe flag on output frames
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Mickaël Raulet
1493b237bd
hevc: Replace nal type chek with equivalent IS_IRAP macro
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Anton Khirnov
17e9d52c8c
hevc_ps: remove a write-only variable
11 years ago
Michael Niedermayer
9195c26d45
avcodec/rv34: fix crash while seeking on very damaged file
...
Fixes null pointer dereference
Fixes Ticket2093
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
0089fb79cc
avformat/cdg: Do not fail if filesize cannot be determined
...
This fixes cdg with piped input which was broken by the previous commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
20ad2152dd
Merge commit '44386aaad870cbd80ae0d08247ebc663476446ff'
...
* commit '44386aaad870cbd80ae0d08247ebc663476446ff':
cdg: Forward error from avio_size() in read_header() function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Nidhi Makhijani
44386aaad8
cdg: Forward error from avio_size() in read_header() function
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
11 years ago
James Almer
ddea3b7106
x86/yadif-10: remove duplicate ABS macro
...
And use the x86util ones instead, which are optimized for mmxext/sse2.
About ~1% increase in performance on pre SSSE3 processors.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Christophe Gisquet
4576eff05d
hevc: derive partial merge list
...
The merge list only needs to be derived up to the merge index.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Christophe Gisquet
bbeaae96eb
hevc: derive partially amvp list
...
When the candidate has been found, no need to derive others.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Clément Bœsch
7e7168b82d
Fix 2 coeffecient typo
11 years ago
Christophe Gisquet
eca1957c4c
hevc: reorder loops
...
iterate over memory in a more continuous order
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Christophe Gisquet
2e471e4703
hevc: simplify rounding
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Yu Xiaolei
64fdcf2428
build: rawvideo decoder depends on bswapdsp
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5682a93841
Merge commit '5adcef9c1bf701ba2dd43363ae983ba6d74bdb9a'
...
* commit '5adcef9c1bf701ba2dd43363ae983ba6d74bdb9a':
mpegts: pass MpegTSContext ptr explicitly
See: 8635954335061ea4c03d3f492b7bc803ea740d9c:
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Dave Rice
a15c5c44e2
doc/filters: add a signalstats example
...
Signed-off-by: Dave Rice <dave@dericed.com>
11 years ago
Alexander V. Lukyanov
5adcef9c1b
mpegts: pass MpegTSContext ptr explicitly
...
AVFormatContext->priv_data is not always a MpegTSContext, it can be
RTSPState when decoding a RTP stream. So it is necessary to pass
MpegTSContext pointer explicitly.
Within libav, the write_section_data function doesn't actually use
the MpegTSContext at all, so this doesn't change anything at the
moment (no memory was corrupted before), but it reduces the risk of
anybody trying to touch the MpegTSContext via AVFormatContext->priv_data
in the future.
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Carl Eugen Hoyos
a1e3ea475a
Fix compilation with --disable-everything.
11 years ago
James Almer
2571e8fe37
alpha/pixblockdsp: move code out of dsputil
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
81538470c8
configure: fix select vs. deps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Lukasz Marek
b7cfd5c29b
gitignore: add examples/transcoding
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c38b593904
configure: add new dependencies for spp & mpdecimate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2d5e9451de
Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'
...
* commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e':
dsputil: Split off pixel block routines into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/pixblockdsp_template.c
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Nicolas Martyanoff
6cc1fec412
avformat/hlsenc: correctly compute target duration
...
With HLS, the duration of all segments must be lower or equal to the target
duration. Therefore floor(duration + 0.5) yields incorrect results.
For example, for duration = 1.35, floor(duration + 0.5) yields 1.0, but the
correct result is 2.0.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
11 years ago
Michael Niedermayer
92c29914de
avcodec/hevc_sei: factor return 1 out of if/else chain
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
efc66d69bf
Merge commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50'
...
* commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50':
hevc: parse display orientation SEI message
Conflicts:
libavcodec/hevc.h
libavcodec/hevc_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cd0dc88751
Merge commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09'
...
* commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09':
h264: parse display orientation SEI message
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c67690f854
Merge commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4'
...
* commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4':
display: add matrix flip api
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e8a966e361
Merge commit '33a7b453a8e1f090c694ea4f36769dc837be88f0'
...
* commit '33a7b453a8e1f090c694ea4f36769dc837be88f0':
doc: mention option to mix shared/static libraries
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
19b9e07ef5
Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'
...
* commit '0307cc2253e76772b1c645ac6117d08da87a147c':
rtpdec: pass an AVFormatContext to ff_parse_fmtp()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f233666880
Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'
...
* commit '650d384048ed42579cc6d67bf32a94b468c0b6cb':
yuv4mpegenc: do not access AVCodecContext.coded_frame
Conflicts:
libavformat/yuv4mpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
57fa9e9742
Merge commit '27c1f82f561932c83191bcd3e70e0cb1712485ba'
...
* commit '27c1f82f561932c83191bcd3e70e0cb1712485ba':
nsvdec: remove commented out cruft
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
73b1283012
Merge commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f'
...
* commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f':
mov: free the dv demux context with avformat_free_context()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
81babc432a
Merge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'
...
* commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb':
mtv: do not set sample_rate for video
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago