virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
58,605 Commits 37 Branches 400 Tags 465 MiB
36068709b3
Commit Graph

9 Commits

Author SHA1 Message Date
Michael Niedermayer
efb5fa79f5 Merge remote branch 'qatar/master' 
* qatar/master: (37 commits)
  In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function.
  lavc: remove reference to opt.h from Makefile.
  prefer avio_check() over url_exist()
  avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols
  lavu: remove misc disabled cruft
  lavu: remove FF_API_OLD_IMAGE_NAMES cruft
NOT PULLED  lavu: remove FF_API_OLD_EVAL_NAMES cruft
  lavc: remove misc disabled cruft.
  lavc: remove the FF_API_INOFFICIAL cruft.
  lavc: remove the FF_API_SET_STRING_OLD cruft.
  lavc: remove the FF_API_USE_LPC cruft.
  lavc: remove the FF_API_SUBTITLE_OLD cruft.
  lavc: remove the FF_API_VIDEO_OLD cruft.
  lavc: remove the FF_API_AUDIO_OLD cruft.
  lavc: remove the FF_API_OPT_SHOW cruft.
  lavc: remove the FF_API_MM_FLAGS cruft.
  lavf: remove misc disabled cruft.
  lavf: remove FF_API_INDEX_BUILT cruft
  lavf: remove FF_API_URL_CLASS cruft.
  lavf: remove FF_API_SYMVER cruft
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-20 04:48:23 +02:00
Anton Khirnov
761ad42968 lavf: remove FF_API_MAX_STREAMS cruft 2011-04-19 18:28:38 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Marton Balint
91861ce25c MMS: also discover streams in extended stream properties object 
Allows playback of nonprimary audio streams in multiple bitrate sources,
such as mmsh://wmscr1.dr.dk/e02ch03m

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 74d6871d62)
 2011-02-20 19:05:46 +01:00
Marton Balint
74d6871d62 MMS: also discover streams in extended stream properties object 
Allows playback of nonprimary audio streams in multiple bitrate sources,
such as mmsh://wmscr1.dr.dk/e02ch03m

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-19 17:51:55 -05:00
Aurelien Jacobs
0f02a7e2d2 mms: remove dependency on MAX_STREAM API 
Originally committed as revision 25335 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-04 19:45:12 +00:00
Ronald S. Bultje
67197656d1 Remove use of MAX_STREAMS in MMSContext->streams[] array. Instead, dynamically 
allocate the array.

Originally committed as revision 24794 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-13 17:30:01 +00:00
Zhentan Feng
c46000c1ff Set fixed chunksize for ASF header in MMS streams, as per MSDN documentation. 
This fixes playback of at least one MMST stream.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 24793 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-13 17:08:57 +00:00
Ronald S. Bultje
6ef14e5753 Add missing mms.c from r24779. 
Originally committed as revision 24780 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 23:45:05 +00:00