Merge branch 'master' of https://github.com/lionel0806/ijkplayer into…

… lionel0806-master

README.md

@@ -1,7 +1,7 @@
 ijkplayer
 =========
 - Video player based on [ffplay](http://ffmpeg.org)
- - Android: [MediaPlayer-like](android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java)
+ - Android: [MediaPlayer-like](android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/IMediaPlayer.java)
  - iOS: [MediaPlayer.framework-like](ios/IJKMediaPlayer/IJKMediaPlayer/IJKMediaPlayback.h)
 
 ### My Build Enviroment
@@ -26,7 +26,7 @@ ijkplayer
 - Android
  - platform: API 9~22
  - cpu: ARMv7a, x86, ARMv5 (ARMv5 is not tested on real devices)
- - api: [MediaPlayer-like](android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IMediaPlayer.java)
+ - api: [MediaPlayer-like](android/ijkplayer/player-java/src/main/java/tv/danmaku/ijk/media/player/IMediaPlayer.java)
  - video output: NativeWindow
  - audio output: OpenSL ES, AudioTrack
  - hw decoder: MediaCodec (API 16+, Android 4.1+)

ijkmedia/ijkplayer/ff_ffplay.c

@@ -3408,9 +3408,15 @@ void ffp_check_buffering_l(FFPlayer *ffp)
     int buf_time_percent      = -1;
     int hwm_in_bytes          = ffp->high_water_mark_in_bytes;
     int need_start_buffering  = 0;
-    int audio_time_base_valid = is->audio_st && is->audio_st->time_base.den > 0 && is->audio_st->time_base.num > 0;
-    int video_time_base_valid = is->video_st && is->video_st->time_base.den > 0 && is->video_st->time_base.num > 0;
+    int audio_time_base_valid = 0;
+    int video_time_base_valid = 0;
     int64_t buf_time_position = -1;
+
+    if(is->audio_st)
+        audio_time_base_valid = is->audio_st->time_base.den > 0 && is->audio_st->time_base.num > 0;
+    if(is->video_st)
+        video_time_base_valid = is->video_st->time_base.den > 0 && is->video_st->time_base.num > 0;
+
     if (hwm_in_ms > 0) {
         int     cached_duration_in_ms = -1;
         int64_t audio_cached_duration = -1;