1fddfaa282
Merge commit '2d9d6afb8d2f284f5e620ecc19f643d5cd3facb8'
* commit '2d9d6afb8d2f284f5e620ecc19f643d5cd3facb8':
movenc: Factorize adding fragment info into a separate function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
b96c1cd78b
Merge commit '0f9eb9165bb7d7982fdedf64f6bcec856f1bedd6'
* commit '0f9eb9165bb7d7982fdedf64f6bcec856f1bedd6':
movenc: Include empty tracks in iods when writing fragmented mp4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
894d10332c
avcodec/lcldec: support rgb24 with width%4 != 0
Fixes Ticket1216
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
92c07acce7
Read (display) aspect ratio from mxf files.
Fixes ticket #4107 .
11 years ago
0b3c230542
configure: Enable mpcodec compilation without inline asm.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
70205f1799
mpcodecs: Use _INLINE guards for inline asm.
Enabled compilation with compiler without inline asm support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
2d9d6afb8d
movenc: Factorize adding fragment info into a separate function
By calling this after writing the moof the first time (for
calculating the moof size), we can avoid intermediate storage
of tfrf_offset in MOVTrack.
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
0f9eb9165b
movenc: Include empty tracks in iods when writing fragmented mp4
When writing fragmented streams with an empty initial moov,
we won't have any samples in any tracks when writing the
moov atom, thus trust that any tracks that are added actually
will be present.
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
cc5f731541
avformat/flvenc: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
4127d97c8d
Merge commit 'c64f3615118d757dcf76040fe5407bf2b3883206'
* commit 'c64f3615118d757dcf76040fe5407bf2b3883206':
flvenc: Send new metadata when FLAG_METADATA_UPDATED is set.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
bb7be3b763
Merge commit '4d0cd5f58c892276716f46f4b2702915e5018215'
* commit '4d0cd5f58c892276716f46f4b2702915e5018215':
flvenc: move metadata updates into a single function
Conflicts:
libavformat/flvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
c88ae843da
Merge commit '8b573ddda75980f724f779ff75aacc2ff81d9e0e'
* commit '8b573ddda75980f724f779ff75aacc2ff81d9e0e':
hevc: remove superfluous assignments and checks
Conflicts:
libavcodec/hevc.c
See: 83976e40e8
11 years ago
91a9ae5b6b
Merge commit 'eac3ac1fe0774b65316852616b2672702dbc3f31'
* commit 'eac3ac1fe0774b65316852616b2672702dbc3f31':
hevc: eliminate an unneeded intermediate variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
0d5af820f7
Merge commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc'
* commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc':
hevc: reduce variable scope
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
c23d7de22e
Merge commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8'
* commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8':
hevc: further reduce code duplication in hls_prediction_unit()
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
e078549421
Merge commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139'
* commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139':
hevc: reduce code duplication in hls_prediction_unit()
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
30156eab6d
Merge commit 'de1f8ead8993512925a3ee6c7491473414419e55'
* commit 'de1f8ead8993512925a3ee6c7491473414419e55':
hevcdsp_template: templatize transquant_bypass
Conflicts:
libavcodec/hevcdsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
c192be1968
Merge commit '16c01fb4347312b6d29a6498dad627665b96a20e'
* commit '16c01fb4347312b6d29a6498dad627665b96a20e':
hevc: remove an unused function parameter
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
e7fdfbdc58
Merge commit '84b9463984083f4e83948c73c1a5dbaf596ff3f7'
* commit '84b9463984083f4e83948c73c1a5dbaf596ff3f7':
hevc: remove a redundant line
See: 83976e40e8
11 years ago
f1b20930f2
Merge commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e'
* commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e':
hevc: do not store rqt_root_cbf in the context
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
7cbe1e0447
Merge commit '920bca3e2332dced9c78bd14cfc2ff138188bd57'
* commit '920bca3e2332dced9c78bd14cfc2ff138188bd57':
hevc: do not store pcm_flag in the context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
c64f361511
flvenc: Send new metadata when FLAG_METADATA_UPDATED is set.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
4d0cd5f58c
flvenc: move metadata updates into a single function
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
8b573ddda7
hevc: remove superfluous assignments and checks
11 years ago
eac3ac1fe0
hevc: eliminate an unneeded intermediate variable
11 years ago
eb335f3c5c
hevc: reduce variable scope
Also, collapse the array into a scalar, since only one value is needed
at a time.
11 years ago
84c0ece5fd
hevc: further reduce code duplication in hls_prediction_unit()
11 years ago
a7b365ae19
hevc: reduce code duplication in hls_prediction_unit()
11 years ago
de1f8ead89
hevcdsp_template: templatize transquant_bypass
11 years ago
16c01fb434
hevc: remove an unused function parameter
11 years ago
84b9463984
hevc: remove a redundant line
pred_mode is overwritten a few lines immediately below.
11 years ago
2c6a7f9348
hevc: do not store rqt_root_cbf in the context
It does not need to be accessed outside of hls_coding_unit().
11 years ago
920bca3e23
hevc: do not store pcm_flag in the context
It does not need to be accessed outside of hls_coding_unit().
11 years ago
9421d974bc
ffmpeg: Fix last newline at log level less than "info"
Fixes Ticket3058
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
4be03a7a6c
cmdutils: Exit in case of faulty stream specifiers
Avoids printing confusing and unrelated errors
Fixes Ticket2772
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
3f07dd6e39
ffserver_config: fix possible crash
Fixes CID #1254662
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
1a054bd187
ffserver_config: do not store preset name
Preset are translated to AVOptions.
It is not required to reparse anymore.
Fixes CID #1254667
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
33d6f90e3e
ffserver: drop pointless explicit !=0 checks
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
11 years ago
20bf91f832
avcodec/roqvideoenc: clear freed pointers
Avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
7ababb85f9
avcodec/snow: clear freed pointers
Avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
00672d2ce5
avcodec/rl2: clear freed pointers
Avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
51ddaf6549
avformat/mpeg: fix memleak of sub_name on error
Fixes CID1254666
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
62eca2f827
avdevice/xcbgrab: Fix/remove unneeded NULL checks
Fixes CID1254664
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
374c907fb3
avcodec/vorbis_parser: Move vp check
Fixes null pointer dereference
Fixes CID1251347
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
1de786777e
avcodec/dvdsubdec: Check all fseek()s return codes
Fixes CID1254660
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
530eb6acf8
avformat/hlsenc: Free context after hls_append_segment
Fixes reading uninitialized memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
ce80f9fee9
avformat/segment: export inner muxer timebase
Fixes "Non-monotonous DTS in output stream 0:0"
Fixes Ticket4020
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
ec01283752
lavf/ffmdec: reident after last commit
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
745730c9c2
lavf/ffm: use AVOption API to store/restore stream properties
This is a generic solution that will not reqiore modifications when new options are added.
This also fixes problem with current implementation when qmin or qmax=-1.
Only 8 bits was sent and read back as 255.
Fixes #1275
Fixes #1461
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
a38e06c1aa
ffserver_config: handle codec private options
This commit allows to set codec's private option.
As side effect, it also improves preset support.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
Michael Niedermayer
Carl Eugen Hoyos
Matthew Oliver
Martin Storsjö
Andrew Stone
Anton Khirnov
Lukasz Marek
Reynaldo H. Verdejo Pinochet