Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacenc: Fix LONG_START windowing.
  aacenc: Fix a bug where deinterleaved samples were stored in the wrong place.
  avplay: use the correct array size for stride.
  lavc: extend doxy for avcodec_alloc_context3().
  APIchanges: mention avcodec_alloc_context()/2/3
  avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS.
  aacsbr: ARM NEON optimised sbrdsp functions
  aacsbr: align some arrays
  aacsbr: move some simdable loops to function pointers
  cosmetics: Remove extra newlines at EOF

Conflicts:
	libavcodec/utils.c
	libavfilter/formats.c
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

22 files changed, 0 insertions, 23 deletions

diff --git a/libavformat/aea.c b/libavformat/aea.c
index 4e255241d1..d849ade6f2 100644
--- a/libavformat/aea.c
+++ b/libavformat/aea.c
@@ -103,4 +103,3 @@ AVInputFormat ff_aea_demuxer = {
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "aea",
 };
-
diff --git a/libavformat/avio.c b/libavformat/avio.c
index 0f6ce31097..8305443ada 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -383,4 +383,3 @@ int ff_check_interrupt(AVIOInterruptCB *cb)
         return ret;
     return 0;
 }
-
diff --git a/libavformat/httpauth.c b/libavformat/httpauth.c
index 2ce5432993..ba31c1a9aa 100644
--- a/libavformat/httpauth.c
+++ b/libavformat/httpauth.c
@@ -265,4 +265,3 @@ char *ff_http_auth_create_response(HTTPAuthState *state, const char *auth,
     }
     return authstr;
 }
-
diff --git a/libavformat/id3v1.h b/libavformat/id3v1.h
index 8eb58be2d1..d5dca35873 100644
--- a/libavformat/id3v1.h
+++ b/libavformat/id3v1.h
@@ -39,4 +39,3 @@ extern const char * const ff_id3v1_genre_str[ID3v1_GENRE_MAX + 1];
 void ff_id3v1_read(AVFormatContext *s);
 
 #endif /* AVFORMAT_ID3V1_H */
-
diff --git a/libavformat/iss.c b/libavformat/iss.c
index a60dc1f4a0..af2fc6e4ac 100644
--- a/libavformat/iss.c
+++ b/libavformat/iss.c
@@ -135,4 +135,3 @@ AVInputFormat ff_iss_demuxer = {
     .read_header    = iss_read_header,
     .read_packet    = iss_read_packet,
 };
-
diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c
index 6969b144ab..f82d4f41cb 100644
--- a/libavformat/lxfdec.c
+++ b/libavformat/lxfdec.c
@@ -346,4 +346,3 @@ AVInputFormat ff_lxf_demuxer = {
     .read_packet    = lxf_read_packet,
     .codec_tag      = (const AVCodecTag* const []){lxf_tags, 0},
 };
-
diff --git a/libavformat/metadata.c b/libavformat/metadata.c
index 1660a604f1..fc3a9d7d55 100644
--- a/libavformat/metadata.c
+++ b/libavformat/metadata.c
@@ -68,4 +68,3 @@ void ff_metadata_conv_ctx(AVFormatContext *ctx, const AVMetadataConv *d_conv,
     for (i=0; i<ctx->nb_programs; i++)
         ff_metadata_conv(&ctx->programs[i]->metadata, d_conv, s_conv);
 }
-
diff --git a/libavformat/movenchint.c b/libavformat/movenchint.c
index bb55f73053..1b8b2c10ea 100644
--- a/libavformat/movenchint.c
+++ b/libavformat/movenchint.c
@@ -459,4 +459,3 @@ void ff_mov_close_hinting(MOVTrack *track) {
     }
     avformat_free_context(rtp_ctx);
 }
-
diff --git a/libavformat/network.c b/libavformat/network.c
index 9beaaaf350..727ca5024f 100644
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -183,4 +183,3 @@ int ff_is_multicast_address(struct sockaddr *addr)
 
     return 0;
 }
-
diff --git a/libavformat/omadec.c b/libavformat/omadec.c
index 5a1660b89f..2f100b8f56 100644
--- a/libavformat/omadec.c
+++ b/libavformat/omadec.c
@@ -445,4 +445,3 @@ AVInputFormat ff_oma_demuxer = {
     .extensions     = "oma,omg,aa3",
     .codec_tag      = (const AVCodecTag* const []){ff_oma_codec_tags, 0},
 };
-
diff --git a/libavformat/rl2.c b/libavformat/rl2.c
index b160098150..8692e22afa 100644
--- a/libavformat/rl2.c
+++ b/libavformat/rl2.c
@@ -297,4 +297,3 @@ AVInputFormat ff_rl2_demuxer = {
     .read_packet    = rl2_read_packet,
     .read_seek      = rl2_read_seek,
 };
-
diff --git a/libavformat/rtpdec_amr.c b/libavformat/rtpdec_amr.c
index fbf4321698..de824904aa 100644
--- a/libavformat/rtpdec_amr.c
+++ b/libavformat/rtpdec_amr.c
@@ -205,4 +205,3 @@ RTPDynamicProtocolHandler ff_amr_wb_dynamic_handler = {
     .free             = amr_free_context,
     .parse_packet     = amr_handle_packet,
 };
-
diff --git a/libavformat/rtpdec_h263.c b/libavformat/rtpdec_h263.c
index ea42fff320..27173f013b 100644
--- a/libavformat/rtpdec_h263.c
+++ b/libavformat/rtpdec_h263.c
@@ -105,4 +105,3 @@ RTPDynamicProtocolHandler ff_h263_2000_dynamic_handler = {
     .codec_id         = CODEC_ID_H263,
     .parse_packet     = h263_handle_packet,
 };
-
diff --git a/libavformat/rtpenc_amr.c b/libavformat/rtpenc_amr.c
index 367789fccd..bd1c197101 100644
--- a/libavformat/rtpenc_amr.c
+++ b/libavformat/rtpenc_amr.c
@@ -63,4 +63,3 @@ void ff_rtp_send_amr(AVFormatContext *s1, const uint8_t *buff, int size)
     memcpy(s->buf_ptr, buff, size);
     s->buf_ptr += size;
 }
-
diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c
index 8a5adf54ed..e4edfc28e1 100644
--- a/libavformat/rtpenc_chain.c
+++ b/libavformat/rtpenc_chain.c
@@ -84,4 +84,3 @@ AVFormatContext *ff_rtp_chain_mux_open(AVFormatContext *s, AVStream *st,
 
     return rtpctx;
 }
-
diff --git a/libavformat/rtpenc_mpv.c b/libavformat/rtpenc_mpv.c
index 0c617337b2..2708dd183c 100644
--- a/libavformat/rtpenc_mpv.c
+++ b/libavformat/rtpenc_mpv.c
@@ -115,5 +115,3 @@ void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)
         end_of_slice = 0;
     }
 }
-
-
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 4a0e8bffee..e4f5c05e0b 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1992,4 +1992,3 @@ AVInputFormat ff_rtp_demuxer = {
     .priv_class     = &rtp_demuxer_class
 };
 #endif /* CONFIG_RTP_DEMUXER */
-
diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c
index b54ae28eb8..7bdacc29f7 100644
--- a/libavformat/rtspenc.c
+++ b/libavformat/rtspenc.c
@@ -245,4 +245,3 @@ AVOutputFormat ff_rtsp_muxer = {
     .flags = AVFMT_NOFILE | AVFMT_GLOBALHEADER,
     .priv_class = &rtsp_muxer_class,
 };
-
diff --git a/libavformat/sapdec.c b/libavformat/sapdec.c
index 0f96a1ecc0..d806400eb1 100644
--- a/libavformat/sapdec.c
+++ b/libavformat/sapdec.c
@@ -236,4 +236,3 @@ AVInputFormat ff_sap_demuxer = {
     .read_close     = sap_read_close,
     .flags = AVFMT_NOFILE,
 };
-
diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c
index 0f2b4b51f0..8a2a193b8e 100644
--- a/libavformat/sapenc.c
+++ b/libavformat/sapenc.c
@@ -261,4 +261,3 @@ AVOutputFormat ff_sap_muxer = {
     .write_trailer     = sap_write_close,
     .flags = AVFMT_NOFILE | AVFMT_GLOBALHEADER,
 };
-
diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index 2417663885..20cf58809e 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -642,4 +642,3 @@ void ff_sdp_write_media(char *buff, int size, AVCodecContext *c, const char *des
 {
 }
 #endif
-
diff --git a/libavformat/seek.c b/libavformat/seek.c
index 65211bfacf..3ffcde4664 100644
--- a/libavformat/seek.c
+++ b/libavformat/seek.c
@@ -516,4 +516,3 @@ void ff_free_parser_state(AVFormatContext *s, AVParserState *state)
     av_free(state->stream_states);
     av_free(state);
 }
-