diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-09-06 15:24:32 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-09-06 15:24:32 +0200 |
| commit | 7012e88090e69339c60a4eb9449f7a7e39ca6aa3 (patch) | |
| tree | 9487bbfc440f54cca64281bd46bf35628d94c9d8 /win32 | |
| parent | 33196cdd2cec82d8fc0546a957bb069208453505 (diff) | |
| parent | 9a8a989a2270d8b7bd964cf0c2ee668fa6dc2fbc (diff) | |
Merge branch 'master' into 0.11
Conflicts:
gst-libs/gst/audio/audio.h
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/audio/gstaudiodecoder.h
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/audio/gstbaseaudioencoder.h
gst/playback/Makefile.am
gst/playback/gstplaybin.c
gst/playback/gstplaysink.c
gst/playback/gstplaysinkvideoconvert.c
gst/playback/gstsubtitleoverlay.c
gst/videorate/gstvideorate.c
gst/videoscale/gstvideoscale.c
win32/common/libgstaudio.def
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/common/libgstaudio.def | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/win32/common/libgstaudio.def b/win32/common/libgstaudio.def index 568f03310..2e89370ac 100644 --- a/win32/common/libgstaudio.def +++ b/win32/common/libgstaudio.def @@ -1,5 +1,5 @@ EXPORTS - _gst_base_audio_decoder_error + _gst_audio_decoder_error gst_audio_buffer_clip gst_audio_channel_position_get_type gst_audio_check_channel_positions @@ -10,7 +10,47 @@ EXPORTS gst_audio_clock_new gst_audio_clock_new_full gst_audio_clock_reset + gst_audio_decoder_finish_frame + gst_audio_decoder_get_audio_info + gst_audio_decoder_get_byte_time + gst_audio_decoder_get_delay + gst_audio_decoder_get_latency + gst_audio_decoder_get_max_errors + gst_audio_decoder_get_min_latency + gst_audio_decoder_get_parse_state + gst_audio_decoder_get_plc + gst_audio_decoder_get_plc_aware + gst_audio_decoder_get_tolerance + gst_audio_decoder_get_type + gst_audio_decoder_set_byte_time + gst_audio_decoder_set_latency + gst_audio_decoder_set_max_errors + gst_audio_decoder_set_min_latency + gst_audio_decoder_set_plc + gst_audio_decoder_set_plc_aware + gst_audio_decoder_set_tolerance gst_audio_default_registry_mixer_filter + gst_audio_duration_from_pad_buffer + gst_audio_encoder_finish_frame + gst_audio_encoder_get_audio_info + gst_audio_encoder_get_frame_max + gst_audio_encoder_get_frame_samples + gst_audio_encoder_get_hard_resync + gst_audio_encoder_get_latency + gst_audio_encoder_get_lookahead + gst_audio_encoder_get_mark_granule + gst_audio_encoder_get_perfect_timestamp + gst_audio_encoder_get_tolerance + gst_audio_encoder_get_type + gst_audio_encoder_proxy_getcaps + gst_audio_encoder_set_frame_max + gst_audio_encoder_set_frame_samples + gst_audio_encoder_set_hard_resync + gst_audio_encoder_set_latency + gst_audio_encoder_set_lookahead + gst_audio_encoder_set_mark_granule + gst_audio_encoder_set_perfect_timestamp + gst_audio_encoder_set_tolerance gst_audio_filter_class_add_pad_templates gst_audio_filter_get_type gst_audio_fixate_channel_positions @@ -33,46 +73,6 @@ EXPORTS gst_audio_sink_get_type gst_audio_src_get_type gst_audio_structure_set_int - gst_base_audio_decoder_finish_frame - gst_base_audio_decoder_get_audio_info - gst_base_audio_decoder_get_byte_time - gst_base_audio_decoder_get_delay - gst_base_audio_decoder_get_latency - gst_base_audio_decoder_get_max_errors - gst_base_audio_decoder_get_min_latency - gst_base_audio_decoder_get_parse_state - gst_base_audio_decoder_get_plc - gst_base_audio_decoder_get_plc_aware - gst_base_audio_decoder_get_tolerance - gst_base_audio_decoder_get_type - gst_base_audio_decoder_set_byte_time - gst_base_audio_decoder_set_latency - gst_base_audio_decoder_set_max_errors - gst_base_audio_decoder_set_min_latency - gst_base_audio_decoder_set_plc - gst_base_audio_decoder_set_plc_aware - gst_base_audio_decoder_set_tolerance - gst_base_audio_encoder_finish_frame - gst_base_audio_encoder_get_audio_info - gst_base_audio_encoder_get_frame_max - gst_base_audio_encoder_get_frame_samples - gst_base_audio_encoder_get_hard_resync - gst_base_audio_encoder_get_latency - gst_base_audio_encoder_get_lookahead - gst_base_audio_encoder_get_mark_granule - gst_base_audio_encoder_get_perfect_timestamp - gst_base_audio_encoder_get_tolerance - gst_base_audio_encoder_get_type - gst_base_audio_encoder_proxy_getcaps - gst_base_audio_encoder_set_frame_max - gst_base_audio_encoder_set_frame_samples - gst_base_audio_encoder_set_hard_resync - gst_base_audio_encoder_set_latency - gst_base_audio_encoder_set_lookahead - gst_base_audio_encoder_set_mark_granule - gst_base_audio_encoder_set_perfect_timestamp - gst_base_audio_encoder_set_tolerance ->>>>>>> master gst_base_audio_sink_create_ringbuffer gst_base_audio_sink_get_drift_tolerance gst_base_audio_sink_get_provide_clock |