generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
48,429 Commits 24 Branches 241 Tags
Commit Graph

12042 Commits

Author SHA1 Message Date
Kanglin
27a15e0af6 hlsenc: make EXT-X-MEDIA-SEQUENCE always increase 2012-12-29 17:26:30 +01:00
Kanglin
0d8cc7a3b2 hlsenc: use the correct AV_TIME_BASE macro 
recording_time is in AV_TIME_BASE units.
 2012-12-29 17:26:30 +01:00
Luca Barbato
6dd93ee6f1 hlsenc: check append_entry return value 2012-12-29 17:26:29 +01:00
Luca Barbato
ae85d6c9c0 hlsenc: use the segment filename in the playlist entry 
Avoid calling av_get_frame_filename twice, once to generate the
segment filename and once to generate the playlist.
 2012-12-29 17:26:29 +01:00
Luca Barbato
66f7b4862f hlsenc: use the basename to generate the list entries 
The segment path is desumed from the playlist path, recording a
relative path in the playlist while serving the file could lead
to misleading results.
 2012-12-29 17:26:29 +01:00
Michael Niedermayer
83d4a8442c Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  cosmetics: Prettyprint codec/format/filter registration files

Conflicts:
	libavcodec/allcodecs.c
	libavdevice/alldevices.c
	libavfilter/allfilters.c
	libavformat/allformats.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-29 14:27:38 +01:00
Michael Niedermayer
2a9443a110 Merge commit '69583bd3b1eba471366141c945030c163e073e02' 
* commit '69583bd3b1eba471366141c945030c163e073e02':
  avfilter: Refactor unconditional filter registration
  build: Add rtpenc_chain extra config option
  configure: Add --disable-all command line option

Conflicts:
	libavfilter/allfilters.c
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-29 13:05:37 +01:00
Paul B Mahol
3f8ee30e63 mmfenc: use ff_raw_write_packet() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-28 22:21:56 +00:00
Paul B Mahol
f18d2137d6 aiffenc: use ff_raw_write_packet() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-28 22:06:39 +00:00
Paul B Mahol
8ad010a7e0 soxenc: use ff_raw_write_packet() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-28 21:58:03 +00:00
Paul B Mahol
a4b62f36c7 soxdec: use meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-28 21:50:42 +00:00
Paul B Mahol
09401694db soxenc: use ffio_fill 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-28 21:48:07 +00:00
Paul B Mahol
a4912aa61e soxenc: use FFALIGN 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-28 21:37:08 +00:00
Diego Biurrun
c73c87b412 cosmetics: Prettyprint codec/format/filter registration files 2012-12-28 19:18:13 +01:00
Diego Biurrun
5ad2f0bfb2 build: Add rtpenc_chain extra config option 
Also fixes linking in various configs with only individual parts enabled
because the RTP muxer chaining code depends on the general RTP code,
which is now accounted for.
 2012-12-28 19:18:13 +01:00
Paul B Mahol
507956824c auenc: do not write invalid file size 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-28 16:29:22 +00:00
Stefano Sabatini
0156dd6530 lavf/segment: add segment_frames option 
This is meant to address trac ticket #1483.
 2012-12-28 11:17:22 +01:00
Stefano Sabatini
7a8face9fb lavf/segment: add reference_stream option 2012-12-28 10:57:02 +01:00
Jean First
7fc73d9ab7 rmdec: fix compiler warning for uninitialized variables 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 23:54:34 +01:00
XBMC
4c41fc88df mpegts: update AVProgram after pmt change 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 20:30:36 +01:00
Tomas Härdin
928727f951 mxfdec: Rescale audio stream duration from EditRate to SampleRate 
Since 83cab07 audio stream time bases are based on SampleRate, not EditRate.
This fixes trac ticket #2029 and a few seeking issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 17:45:34 +01:00
Michael Niedermayer
1be8d0fbda srt_probe: make buffer pointer const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 02:57:48 +01:00
Michael Niedermayer
f89f3d4a98 str_probe: make buffer related pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:55:22 +01:00
Michael Niedermayer
28b9099ac1 pva_probe: make buffer related pointers and function arguments const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:54:41 +01:00
Michael Niedermayer
59693ed96c mxf_probe: make buffer related pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:54:20 +01:00
Michael Niedermayer
c8e5efb496 mpc8_probe: make buffer related pointers and function arguments const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:51:59 +01:00
Michael Niedermayer
7a84664ffe mp3_read_probe: make buffer related pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:51:32 +01:00
Michael Niedermayer
9d95deef61 microdvd_probe: make buffer pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:50:58 +01:00
Michael Niedermayer
c3cb338955 mpegps_probe: make buffer related pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:50:14 +01:00
Michael Niedermayer
e1f9432644 loas_probe: make buffer pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:45:56 +01:00
Michael Niedermayer
29397c99e0 lmlm4_probe: make buffer pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:45:43 +01:00
Michael Niedermayer
23348647b2 ipmovie_probe: make buffer pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:44:59 +01:00
Michael Niedermayer
4fcf6aa7a3 flac_probe: make buffer pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:43:14 +01:00
Michael Niedermayer
658bd6db7b ac3_eac3_probe: mark buffer pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:42:23 +01:00
Michael Niedermayer
d7e050b11d adts_aac_probe: mark buffer pointers as const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:41:00 +01:00
Michael Niedermayer
ec40d15d82 oggdec: fix warning: assignment discards qualifiers from pointer target type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 22:37:24 +01:00
Michael Niedermayer
70d5cd103a mcdec: suppress "warning: a/vst may be used uninitialized in this function" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 18:31:37 +01:00
Michael Niedermayer
e9c4f36c52 lavf/mpeg: suppress warning: lpcm_header_len may be used uninitialized in this function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 18:18:03 +01:00
Michael Niedermayer
d69238e991 Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a' 
* commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a':
  Return proper error code after av_log_ask_for_sample()
  configure: cosmetics: Separate hwaccel dependencies from decoders/encoders
  oggdec: check memory allocation

Conflicts:
	configure
	libavcodec/pictordec.c
	libavformat/anm.c
	libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 15:09:58 +01:00
Michael Niedermayer
c6664242e0 Merge commit 'f5f1cf52240759208b42477e2157a7b4409ade10' 
* commit 'f5f1cf52240759208b42477e2157a7b4409ade10':
  oggdec: K&R cosmetic formatting
  hlsenc: correctly report target duration

Conflicts:
	libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 14:43:03 +01:00
Michael Niedermayer
d4d8d4f786 rl2: return EOF on EOF 
Fixes Ticket1947

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 02:51:51 +01:00
Martin Storsjö
4a9f7d2bf9 hlsenc: Don't duplicate a string constant 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-24 00:02:48 +02:00
Stefano Sabatini
3193b13aa1 hlsenc: Allocate enough space for the pattern string 
If s->filename doesn't contain any period/filename extension to strip
away, the buffer will be too small to fit both strings. This isn't
any buffer overflow since the concatenation uses av_strlcat with
the right buffer size.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-24 00:02:45 +02:00
Paul B Mahol
4f5440adc2 NIST SPHERE demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-23 21:22:43 +00:00
Diego Biurrun
f3298f1299 Return proper error code after av_log_ask_for_sample() 2012-12-23 18:56:56 +01:00
Piotr Bandurski
9bbfcc2675 rmenc: write correct bytes per minute 
improves playback of ac3 in RealPlayer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-23 16:08:10 +01:00
Piotr Bandurski
76f126ba2e rmdec: set bit rate for ra3 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-23 15:59:41 +01:00
Luca Barbato
ba064ebe48 oggdec: check memory allocation 2012-12-23 12:19:15 +01:00
Luca Barbato
f5f1cf5224 oggdec: K&R cosmetic formatting 2012-12-23 12:19:08 +01:00
Luca Barbato
7e98956e72 hlsenc: correctly report target duration 2012-12-23 12:13:41 +01:00