1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
FFmpeg/tests/ref
Michael Niedermayer 434f248723 Merge remote branch 'qatar/master'
* qatar/master: (22 commits)
  ac3enc: move extract_exponents inner loop to ac3dsp
  avio: deprecate url_get_filename().
  avio: deprecate url_max_packet_size().
  avio: make url_get_file_handle() internal.
  avio: make url_filesize() internal.
  avio: make url_close() internal.
  avio: make url_seek() internal.
  avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together
  avio: make url_write() internal.
  avio: make url_read_complete() internal.
  avio: make url_read() internal.
  avio: make url_open() internal.
  avio: make url_connect internal.
  avio: make url_alloc internal.
  applehttp: Merge two for loops
  applehttp: Restructure the demuxer to use a custom AVIOContext
  applehttp: Move finished and target_duration to the variant struct
  aacenc: reduce the number of loop index variables
  avio: deprecate url_open_protocol
  avio: deprecate url_poll and URLPollEntry
  ...

Conflicts:
	libavformat/applehttp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-05 02:31:56 +02:00
..
acodec ac3enc: select bandwidth based on bit rate, sample rate, and number of 2011-04-03 20:59:14 -04:00
fate lavf: inspect more frames for fps when container time base is coarse 2011-04-03 03:18:06 +02:00
lavf Merge remote branch 'qatar/master' 2011-04-05 02:31:56 +02:00
lavfi Fix yuvj420p scaling artefact, issue1108. 2011-04-03 16:40:11 +02:00
seek ac3enc: select bandwidth based on bit rate, sample rate, and number of 2011-04-03 20:59:14 -04:00
vsynth1 In ipod/mov/mp4 muxer, always write esds descriptor length using 4 bytes, 2011-03-30 14:09:09 -07:00
vsynth2 In ipod/mov/mp4 muxer, always write esds descriptor length using 4 bytes, 2011-03-30 14:09:09 -07:00