Commit Graph

1592 Commits

Author SHA1 Message Date
Aurelien Jacobs
3b61ab0b03 put_*() are not only useful to muxers and protocol
fix compilation of matroska demuxer with --disable-muxers --disable-protocols

Originally committed as revision 7323 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-16 20:40:09 +00:00
Panagiotis Issaris
0cd4faf977 Allow provision of displaynumber, screennumber, x-offset and y-offset parameters
to the x11grab device.

Originally committed as revision 7320 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-15 13:19:03 +00:00
Baptiste Coudurier
7224e89638 dont segv is ap->device is not set, display error message
Originally committed as revision 7312 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 10:18:38 +00:00
Baptiste Coudurier
ba78f9d486 fix compilation, use the standard INT64_C macro
Originally committed as revision 7311 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 10:08:27 +00:00
Guillaume Poirier
05f3b6ab06 remove trailing whitespace left over
Originally committed as revision 7310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 09:14:30 +00:00
Edouard Gomez
bd8393387f Feedback from Karl H. Beckers about mouse cursor
(patch by Edouard Gomez)

Originally committed as revision 7309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 08:51:01 +00:00
Edouard Gomez
6e71a18eda RFC 6: Overall cleanups again.
- License should be fixed now (finally)
- Added doxygen comments
- Cleaned up the X11Grab structure
- Renamed X11Grab structure to x11_grab_s
- Changed some Java stylish named functions to more C'stylish ones
- Changed order of some parameters so they are more libc alike with
  destination as first parameter
- Use AVRational where relevant
- Fixed time calculation
- Cleaned up a few little tiny things around the sources
  + removed a goto
  + removed unused vars
  + etc...
(Patch by Edouard Gomez)

Originally committed as revision 7308 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 08:50:30 +00:00
Edouard Gomez
0235a3116e RFC 5: Mouse cursor painting reduc and more cleanups
- License is for FFmpeg, not "this program"
- Rewrite mouse cursor painting functions
- Cosmetic on 2 function declarations
(patch by Edouard Gomez)

Originally committed as revision 7307 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 08:49:34 +00:00
Edouard Gomez
aac105fcd1 RFC 3&4 stage: FFmpeg style aint't my style
- Tabs are 4 width
- No tabs allowed
(patch by Edouard Gomez)

Originally committed as revision 7306 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 08:48:56 +00:00
Edouard Gomez
ef84bf0404 RFC 2 stage: First feedback from review comments
- License is GPL, simplify the license header to make it clear
- Add myself to license header, clarify who did what
- Use 64 bit PTS
- Move mouse bitmaps to the mouse cursor painting function. Make them
  const again
  - Properly detach X11 from the shared memory segment on close
  - Destroy X11 image on close
(patch by Edouard Gomez)

Originally committed as revision 7305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 08:48:13 +00:00
Edouard Gomez
65a1c656d7 RFC 1 stage: Improve maintainability of the cursoir painting code
- Turned the mouse cursor painting code into a macro for more
  maintainability
  - Dropped mouse cursor painting in 8bit mode
  - Removed log when dropping frames
  - Free the shared memory segment on close
(patch by Edouard Gomez)

Originally committed as revision 7304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 08:47:14 +00:00
Edouard Gomez
2909f17717 Adapt the patch to more recent FFmpeg habits
- Indentation
- Use av_log instead of fprintf
- Removed strdup of the device name. It was unused
- Cleaned things a bit
(patch by Edouard Gomez)

Originally committed as revision 7303 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 08:46:31 +00:00
Guillaume Poirier
f58f4ce19d Original X11 device demuxer patch from Clemens Fruhwirth
- Build system integration is equivalent to RFC #6 patch
- Same rule applies to ffmpeg.c/allformats.[c|h]
- x11grab.c is from Clemens Fruhwirth except the x11 grab
  structure for libavformat registration is renamed to
    match build system integration.

Originally committed as revision 7302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 08:45:36 +00:00
Guillaume Poirier
83c547a4a1 revert broken commit of x11 device demuxer patch
Originally committed as revision 7301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 00:06:33 +00:00
Guillaume Poirier
77e5024c1c Feedback from Karl H. Beckers about mouse cursor
Reverse direction of the mouse cursor pointer

Originally committed as revision 7300 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 22:32:14 +00:00
Guillaume Poirier
bfac8d3ae7 RFC 6: Overall cleanups again.
- License should be fixed now (finally)
- Added doxygen comments
- Cleaned up the X11Grab structure
- Renamed X11Grab structure to x11_grab_s
- Changed some Java stylish named functions to more C'stylish ones
- Changed order of some parameters so they are more libc alike with
  destination as first parameter
- Use AVRational where relevant
- Fixed time calculation
- Cleaned up a few little tiny things around the sources
  + removed a goto
  + removed unused vars
  + etc...

Originally committed as revision 7299 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 22:32:12 +00:00
Guillaume Poirier
86904e836a RFC 5: Mouse cursor painting reduc and more cleanups
- License is for FFmpeg, not "this program"
- Rewrite mouse cursor painting functions
- Cosmetic on 2 function declarations

Originally committed as revision 7298 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 22:32:10 +00:00
Guillaume Poirier
9b91c1e265 RFC 3&4 stage: FFmpeg style aint't my style
- Tabs are 4 width
- No tabs allowed

Originally committed as revision 7297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 22:32:08 +00:00
Guillaume Poirier
04b01de857 RFC 2 stage: First feedback from review comments
- License is GPL, simplify the license header to make it clear
- Add myself to license header, clarify who did what
- Use 64 bit PTS
- Move mouse bitmaps to the mouse cursor painting function. Make them
  const again
- Properly detach X11 from the shared memory segment on close
- Destroy X11 image on close

Originally committed as revision 7296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 22:32:06 +00:00
Guillaume Poirier
d797fdf493 RFC 1 stage: Improve maintainability of the cursoir painting code
- Turned the mouse cursor painting code into a macro for more
  maintainability
- Dropped mouse cursor painting in 8bit mode
- Removed log when dropping frames
- Free the shared memory segment on close

Originally committed as revision 7295 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 22:32:04 +00:00
Guillaume Poirier
b9255fb98a Adapt the patch to more recent FFmpeg habits
- Indentation
- Use av_log instead of fprintf
- Removed strdup of the device name. It was unused
- Cleaned things a bit

Originally committed as revision 7294 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 22:32:02 +00:00
Guillaume Poirier
e519b02c10 Original X11 device demuxer patch from Clemens Fruhwirth
- Build system integration is equivalent to RFC #6 patch
- Same rule applies to ffmpeg.c/allformats.[c|h]
- x11grab.c is from Clemens Fruhwirth except the x11 grab
  structure for libavformat registration is renamed to
  match build system integration.

Originally committed as revision 7293 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 22:31:46 +00:00
Michael Niedermayer
e07d8929eb indent
Originally committed as revision 7290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 14:08:19 +00:00
Michael Niedermayer
fd97f6a2ea the next r_frame_rate try ...
discard first duration
	accumulate remaining durations
	add 15000/1001 and 12000/1001

Originally committed as revision 7289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 14:07:46 +00:00
Allan Hsu
428cc588f2 add FLV decoder metadata parsing
patch by Allan Hsu % allan A counterpop P net %
date: Dec 12, 2006 12:19 PM
subject: Re: [Ffmpeg-devel] [PATCH] FLV decoder metadata reading

Originally committed as revision 7286 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 12:29:33 +00:00
Michael Niedermayer
06d1e5c2b6 gcc 2.95 fix
Originally committed as revision 7285 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 12:24:30 +00:00
Michael Niedermayer
4d43cbcc74 rewrite r_frame_rate selectioon code again
Originally committed as revision 7283 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 16:59:10 +00:00
Baptiste Coudurier
1aad0dfd62 remove useless sampleDuration
Originally committed as revision 7281 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 13:31:20 +00:00
Baptiste Coudurier
b596102e7e check codec frame size directly and only for audio
Originally committed as revision 7280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 13:30:37 +00:00
Michael Niedermayer
15f14fc7c2 move duration finding code into read_packet() so it can be skiped if duration has already been set
Originally committed as revision 7272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-10 17:53:01 +00:00
Michael Niedermayer
17fcb1709f use amf_get_string()
Originally committed as revision 7271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-10 17:38:16 +00:00
Michael Niedermayer
759dd138df cosmetics
Originally committed as revision 7270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-10 17:32:05 +00:00
Michael Niedermayer
896bcd2e85 amf_get_string() by Allan Hsu allan aat counterpop doot net
Originally committed as revision 7269 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-10 17:31:17 +00:00
Michael Niedermayer
4eb0c66505 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
Originally committed as revision 7268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-10 17:25:30 +00:00
Michael Niedermayer
c45388b193 set flags correctly in write header instead of seeking back and fixing it in write_trailer()
Originally committed as revision 7267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-10 17:12:45 +00:00
Måns Rullgård
f27a726809 use standard INT64_MAX instead of MAXINT64 (and MIN)
Originally committed as revision 7241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 00:47:37 +00:00
Måns Rullgård
8da9266cea use the standard INT64_C() macro for 64-bit constants
Originally committed as revision 7240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 23:46:11 +00:00
Baptiste Coudurier
68a432cf14 cosmetics, remove braces, remove spaces just inside parens
Originally committed as revision 7236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 17:17:33 +00:00
Andy Parkins
8533284dae do not truncate pts/dts if value is AV_NOPTS_VALUE, patch by Andy Parkins, andrew parkins at 360visiontechnology com
Originally committed as revision 7234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 15:46:12 +00:00
Allan Hsu
6cac3a3b08 Defines various common FLV format values between the FLV muxer and demuxer
in a common flv.h.
patch by Allan Hsu  allan _at_ counterpop.net

Originally committed as revision 7231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 00:23:04 +00:00
Ryan Martell
73fe1052dd Minor modifications to handle mms streaming.
Patch by Ryan Martell rdm4 martellventures com.

Originally committed as revision 7221 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-04 15:46:32 +00:00
Baptiste Coudurier
d1e8675c2e probe with some success image files not containing number pattern but having recognized image extension
Originally committed as revision 7219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-04 11:42:48 +00:00
Kostya Shishkov
5f3c4ba46c Do not touch pkt->pts
Originally committed as revision 7217 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-03 05:47:55 +00:00
Kostya Shishkov
dfbb76d373 Some VQA v1 files don't have audio stream
Originally committed as revision 7216 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-03 05:29:00 +00:00
Mike Melanson
b40a061fcb Simplify the Sega FILM/CPK demuxer to not modify the bastardized Cinepak stream.
I changes the lavc Cinepak decoder some time ago to be able to handle the deviant
data, but never updated this demuxer.

Originally committed as revision 7214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-02 21:28:05 +00:00
Allan Hsu
56cca5f10c Fix wrong flags for S16LE and S16BE audio in FLV files.
patch by Allan Hsu, allan counterpop net

Originally committed as revision 7194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-01 10:26:54 +00:00
Loïc Le Loarer
8fa641f8e8 Fix compile with --disable-muxers, patch by Loïc Le Loarer, lll+ffmpeg m4x org.
Originally committed as revision 7185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-30 01:00:12 +00:00
Kostya Shishkov
61710f7bb5 Better VQA demuxer
Originally committed as revision 7184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-29 05:42:59 +00:00
Aurelien Jacobs
be691b1060 matroska: scale timecode according to time_scale
fixes jerky playback of planet.earth.mkv

Originally committed as revision 7181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-28 23:41:53 +00:00
Baptiste Coudurier
7f25df4cd3 move source_package declaration in the loop and reset it each iteration
Originally committed as revision 7180 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-28 17:17:36 +00:00