Commit Graph

1608 Commits

Author SHA1 Message Date
Michael Niedermayer 4b96d28abc ignore duration of the first 2 frames in the max-time break check
fixes framerate detection for framerate_misdetected.wmv

Originally committed as revision 7384 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-29 21:41:06 +00:00
Michael Niedermayer 6268538afa do not base frame rate guess on just one duration
Originally committed as revision 7383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-29 21:16:21 +00:00
Allan Hsu 148c9bdbb8 Patch for the FLV muxer to supply more complete metadata
in the onMetaData header. Patch by Allan Hsu <allan at counterpop dot net>.

Originally committed as revision 7382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-28 12:35:22 +00:00
Kostya Shishkov e311363245 Enable forward seek in Musepack demuxer
Originally committed as revision 7381 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-28 05:33:31 +00:00
Mike Frysinger d037d797a4 fall back mmap() call using MAP_PRIVATE for working on no-mmu systems
patch by Mike Frysinger   vapier.adi _at_ gmail.com

Originally committed as revision 7380 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-28 00:32:06 +00:00
Patrice Bensoussan 62ade082bb Decode genre on asf/wma files.
patch by  patrice.bensoussan _at_ free.fr

Originally committed as revision 7379 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-28 00:24:24 +00:00
Kostya Shishkov 185c7b6b26 Musepack SV7 decoding support
Originally committed as revision 7375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-24 04:51:43 +00:00
Diego Biurrun f8aa696f9f Properly check for all required bktr headers.
inspired by a patch from Tatu Kilappa, trilkk iki fi

Originally committed as revision 7374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-24 03:53:15 +00:00
Oded Shimon d7d3efae82 sync to libnut, nom->num
Originally committed as revision 7367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-23 12:33:37 +00:00
Diego Biurrun 3a1018d4d8 Register x11grab only when it has been enabled.
Originally committed as revision 7366 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-23 07:19:56 +00:00
Ramiro Polla acb3b537f3 support files >2GB on MinGW
patch by Ramiro Polla, angustia arrozcru.no-ip org

Originally committed as revision 7362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-22 23:44:04 +00:00
Diego Biurrun 56a059ac86 Make the X11 frame grabber disabled by default.
Originally committed as revision 7353 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-22 04:38:24 +00:00
Diego Biurrun 4a49d9b2f8 Remove useless #include.
Originally committed as revision 7339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-21 11:14:56 +00:00
Ramiro Polla 2cb396eb8b Remove useless MinGW #ifdefs.
patch by Ramiro Polla, ramiro lisha.ufsc br

Originally committed as revision 7338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-21 11:12:55 +00:00
Joakim Plate e825b5009f Fix a crash when probing img2 format with a NULL filename.
patch by elupus _at_ ecce.se

Originally committed as revision 7335 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-20 23:33:50 +00:00
Aurelien Jacobs 9110a0e32d Add support for VP60 and VP61.
Originally committed as revision 7329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-17 22:00:12 +00:00
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