RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
61,745 Commits 36 Branches 392 Tags 306 MiB
Commit Graph

61745 Commits

Author SHA1 Message Date
Michael Niedermayer 0dd4eff588 Merge commit 'fb7127b2c836b53ad5168887cd12871312c8708d' 
* commit 'fb7127b2c836b53ad5168887cd12871312c8708d':
  build: h264 parser depends on full h264 decoder

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 00:20:56 +01:00
Michael Niedermayer 3788b8dbe6 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavu: add myself as dynarray.h maintainer.
  ffmpeg: sub2video: send a last blank frame before closing.
  tools: add dvd2concat.
  lavf/concatdec: allow to match streams by id.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 00:05:23 +01:00
Luca Barbato fb7127b2c8 build: h264 parser depends on full h264 decoder 2014-03-23 22:41:11 +01:00
Michael Niedermayer 5dfbecb3a3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  RELEASE_NOTES: mention new filters

Conflicts:
	doc/RELEASE_NOTES

Not merged as these things where in past ffmpeg releases already.
Or at least some of them where, volunteers to checks this and update
our release notes are welcome

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-23 19:52:45 +01:00
Nicolas George c0c1fe797c lavu: add myself as dynarray.h maintainer. 2014-03-23 19:17:20 +01:00
Nicolas George 521707d42e ffmpeg: sub2video: send a last blank frame before closing. 
Fix trac ticket #3420.
 2014-03-23 19:16:35 +01:00
Nicolas George 27cff4f6f8 tools: add dvd2concat. 2014-03-23 19:15:07 +01:00
Nicolas George 26dea7731e lavf/concatdec: allow to match streams by id. 
That makes the concat demuxer usable with MPEG-PS streams,
even when the streams in the different parts are detected
in different order.
 2014-03-23 19:15:07 +01:00
Carl Eugen Hoyos cc6d549adb Always pass the configure option sysroot to --sysroot and -isysroot. 
On darwin, --sysroot may be ignored.
 2014-03-23 19:01:16 +01:00
Carl Eugen Hoyos 942cded690 Autodetect VDA like all other hardware acccelerations. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-23 17:47:28 +01:00
Vittorio Giovara 2a38651033 RELEASE_NOTES: mention new filters 2014-03-23 17:30:52 +01:00
Michael Niedermayer c8246d3766 avcodec/x86/h264_qpel: Fix typo introduced by 322a1dda97 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-23 15:04:53 +01:00
Michael Niedermayer 82a90e7764 Move avpriv_find_pix_fmt() to utils.c 
Fixes build with --disable-everything

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-23 13:25:42 +01:00
wm4 686e662676 http: restructure http_connect error handling path 
The authstr memory allocations make it annoying to error in the middle
of the header setup code, so apply the usual C error handling idiom to
make it easier to error at any point.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-23 05:56:35 +01:00
Michael Niedermayer 6ee2911996 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: drop ff_pixfmt_list_420

Conflicts:
	libavcodec/flvdec.c
	libavcodec/msmpeg4dec.c
	libavcodec/rv10.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-23 03:56:43 +01:00
Michael Niedermayer acb8d655d7 Merge commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b' 
* commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b':
  changelog: switch libx265 and compand entries

Conflicts:
	Changelog

Not many changes as libx265 and compand are placed correctly for us

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-23 03:46:40 +01:00
Michael Niedermayer 1abb031959 Merge commit '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1' 
* commit '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1':
  configure: Always use -DOPJ_STATIC when checking for openjpeg

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-23 03:32:00 +01:00
Michael Niedermayer 802e5fc8f8 Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f' 
* commit '1e9db41e2a2166be5671b088ef4ad06a40af459f':
  movenc: Allow override of major brand in ftyp atom

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-23 03:22:20 +01:00
Vittorio Giovara 6f6c029464 lavc: drop ff_pixfmt_list_420 2014-03-23 01:56:58 +01:00
Vittorio Giovara d5717bc4e9 changelog: switch libx265 and compand entries 2014-03-23 01:56:58 +01:00
Luca Barbato 0f0d1d056e configure: Always use -DOPJ_STATIC when checking for openjpeg 
Unbreaks windows systems not providing pkgconf files.

Reported-By: Rafaël Carré <funman@videolan.org>
 2014-03-23 01:14:31 +01:00
John Stebbins 1e9db41e2a movenc: Allow override of major brand in ftyp atom 
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
 2014-03-23 00:31:54 +01:00
Michael Niedermayer fc567ac49e avcodec: Add padding after the remaining AVFrames 
This limits ABI issues in case libavcodec is linked to a libavutil with larger AVFrame
Which can happen if they are shiped in seperate binary packages and libavutil is upgraded

A cleaner alternative would be to replace them by pointers but this would likely cause
a small speedloss

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-23 00:28:51 +01:00
Michael Niedermayer 2765c2ec7d Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  mpegts: fix teletext pts of streams with standalone pcr pid
  mpegts: add pcr filter for tracking standalone pcr pids
  mpegts: factorize mpegts filter creator code
  mpegts: move last_pcr to MpegTSFilter level

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 23:50:49 +01:00
Michael Niedermayer de182701ac Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lagarith: Fix typo in printf format string

Conflicts:
	libavcodec/lagarith.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 23:44:28 +01:00
Michael Niedermayer 9d6a27d533 Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f' 
* commit '57f09608e1600d1cf1679885a46f5004d522d68f':
  dsputil: Move thirdpel-related bits into their own context

Conflicts:
	libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 23:26:23 +01:00
Michael Niedermayer 74fed968d1 Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f' 
* commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f':
  x86: dsputil: Move hpeldsp-related declarations to a separate header

Conflicts:
	libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 23:21:54 +01:00
Michael Niedermayer 816d7936a7 Merge commit 'ae116cd3ed908d28b69d5198712217ec743d74f6' 
* commit 'ae116cd3ed908d28b69d5198712217ec743d74f6':
  ppc: dsputil: Move hpeldsp-related declarations to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 23:17:03 +01:00
Michael Niedermayer 9333bba6ed Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b' 
* commit '6655c933a887a2d20707fff657b614aa1d86a25b':
  x86: dsputil: Move fpel declarations to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 23:08:22 +01:00
Michael Niedermayer 77bc342975 Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81' 
* commit '322a1dda973e802db7b57f2007fad3efcd5bab81':
  dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros

Conflicts:
	libavcodec/arm/hpeldsp_init_arm.c
	libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 22:53:33 +01:00
Michael Niedermayer 672c610d84 Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c' 
* commit 'f9279ee74936b4990fc46287c27816ef828cc06c':
  dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h

Conflicts:
	libavcodec/imgconvert.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 22:23:04 +01:00
Michael Niedermayer d6d3cfb0aa Merge commit '600b854ad8173995518bd917e7f86120b5505088' 
* commit '600b854ad8173995518bd917e7f86120b5505088':
  imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil

Conflicts:
	libavcodec/imgconvert.c
	libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 22:17:54 +01:00
Michael Niedermayer 8fbc6e5911 Merge commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd' 
* commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd':
  x86: dsputil: Move inline assembly macros to a separate header

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 22:11:27 +01:00
Michael Niedermayer 32da2fd422 Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f' 
* commit '1df0b061621b10edde87e3ab7ea83aed381c574f':
  nuv: Reuse the DSPContext from RTJpegContext

Conflicts:
	libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 21:58:04 +01:00
Michael Niedermayer 82c742377a avutil/dynarray: remove debug av_log() from AV_DYNARRAY_ADD 
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 21:47:38 +01:00
Michael Niedermayer 9ba1190297 avutil/mem: avoid using intptr_t to access void* in av_dynarray_add() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 21:14:57 +01:00
Nicolas George b0dcf76530 lavu/mem: reimplement the dynarray functions with the macro. 
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 20:53:36 +01:00
Nicolas George 7b9a310d0e lavu: add AV_DYNARRAY_ADD() macro. 
Signed-off-by: Nicolas George <george@nsup.org>
Reviewed-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 20:53:31 +01:00
Michael Niedermayer cd1d4b51e3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  float_dsp: Replace arch optimization ifdefs by if cascade

Conflicts:
	libavutil/float_dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 18:52:21 +01:00
Michael Niedermayer 8d024c5107 Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198' 
* commit 'cc8163e1a3601a56f722a4720516e860bf1c6198':
  avcodec: more correct printf specifiers

Conflicts:
	libavcodec/4xm.c
	libavcodec/alsdec.c
	libavcodec/dfa.c
	libavcodec/h264_ps.c
	libavcodec/jpeg2000dec.c
	libavcodec/lagarith.c
	libavcodec/mpeg12dec.c
	libavcodec/rv10.c
	libavcodec/svq3.c
	libavcodec/wmaprodec.c
	libavcodec/xwddec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 18:43:40 +01:00
Diego Biurrun 4f4840377f lagarith: Fix typo in printf format string 
libavcodec/lagarith.c:671:16: warning: '#' flag used with ‘%u’ gnu_printf format [-Wformat]
 2014-03-22 18:36:33 +01:00
Michael Niedermayer 7ef8d97b1a Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da' 
* commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da':
  avfilter: more correct printf format specifiers

Conflicts:
	libavfilter/af_ashowinfo.c
	libavfilter/vf_showinfo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 18:21:10 +01:00
Peter Ross 54df8b4fea fate: add cine demux test 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 17:50:02 +01:00
Michael Niedermayer ae4b11df0d avcodec/snowenc: make snow non experimental 
After this commit the created bitstream will be supported by future
decoders.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 16:52:51 +01:00
rogerdpack 3eafe1d71c udp: try to clarify verbiage on buffer_size 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 16:46:06 +01:00
rogerdpack 0b4c5c99bc avformat/udp: cleanup comments, add a warning if receive buffer is unexpectedly unable to be set high enough 
which can happen easily in linux

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 16:40:46 +01:00
Diego Biurrun 57f09608e1 dsputil: Move thirdpel-related bits into their own context 2014-03-22 06:17:30 -07:00
Diego Biurrun 82dd1026cf x86: dsputil: Move hpeldsp-related declarations to a separate header 2014-03-22 06:17:29 -07:00
Diego Biurrun ae116cd3ed ppc: dsputil: Move hpeldsp-related declarations to a separate header 2014-03-22 06:17:29 -07:00
Diego Biurrun 6655c933a8 x86: dsputil: Move fpel declarations to a separate header 2014-03-22 06:17:29 -07:00