android/jni: use 1 instead of true to suppress warning
avplayer bug fixed
android/compile-ijk.sh: support build armv7a only
android/build: simplify script
.gitignore: ignore android/ijkmediaplayer-x86/.settings/*
ios: build arm64 by default
ios: update project to xcode 6.1.0
修复av暂停不了
ios/IJKMediaDemo:upgrade to xcode 6.1
ff_ffplay: merge 5a5128bab9b87d09189ae3559d9eb67d05be1376

ffplay: factorize frame queue operations

Create a generic frame and a frame queue struct to handle video picture queues
and subtitle picture queues with common code. Also add the possibility to queue
AVFrames, however at the moment we only use SDL_Overlay buffers for video and
AVSubtitles for subtitles.
ff_ffplay: merge 164376483f231bc5a488fbee28679df440d6edcb

ffplay: use frame queue to determine last used pos
ff_ffplay: merge 9e0d1c00b5832e80dc11368e3d39f9e2ec9346f1

ffplay: factorize decoder functions to generic decoder
ff_ffplay: merge 1f5a3cf688bcaf998bf00e84d2654983b2f4719f

ffplay: move pts calculating code to generic decoder
ff_ffplay: merge 266b3d4fe48af53acff454ca59c507bc7d05885f

ffplay: use av_codec_get_pkt_timebase()
ff_ffplay: merge 2ec4a84dca603a24a8131297036dfe30eed33dd7

ffplay: Separate AVFrame from AVSubtitle

This is more robust and should avoid false positives in coverity
That is if the type is ever mixed up, after this patch that would
just be a null pointer dereference instead of a random possibly
out of array access
ff_ffplay: merge ce928d7d2b3bd68a222cfbc19a44805ac4cdaf14

ffplay: dont leave swresampler in half initialized state

On init failure, let's just free it, so next time it will be recreated from
start.

Also fixes Coverity CID 1241515.
ff_ffplay: merge 019ff7a0c37a25068c99b7b72cc9650a2a47863e

Merge commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767'

* commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767':
  avplay: Always free find_stream_info options

Conflicts:
ffplay.c
ff_ffplay: merge ee73a69020a8343e827a21a0de92ca1b05f89588

Merge commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc'

* commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc':
  avplay: Always free opts

Conflicts:
ffplay.c
ff_ffplay: merge 0edf3e7a28d0ace1c37f89fa315c0a6b55873439

ffplay: remove manual bug option handling code

It is supported as a codec option, and those are already parsed.
ff_ffplay: merge 0edf3e7a28d0ace1c37f89fa315c0a6b55873439

ffplay: remove manual bug option handling code

It is supported as a codec option, and those are already parsed.