Changelog: release is 2.5 not "next"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/aacdec: reduce noisiness of missing channel elements
2014-12-04 02:16:55 +01:00 · 2014-12-04 01:58:32 +01:00 · 2014-12-04 01:58:28 +01:00 · 2014-12-04 00:47:17 +01:00
6 changed files with 9 additions and 6 deletions
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.

-version <next>:
+version 2.5:
 - HEVC/H.265 RTP payload format (draft v6) packetizer
 - SUP/PGS subtitle demuxer
 - ffprobe -show_pixel_formats option
--- a/2
+++ b/2
@ -1 +1 @@
-2.4.git
+2.5
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@ -31,7 +31,7 @@ PROJECT_NAME           = FFmpeg
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.

-PROJECT_NUMBER         =
+PROJECT_NUMBER         = 2.5

 # With the PROJECT_LOGO tag one can specify a logo or icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@ -2780,7 +2780,7 @@ static void spectral_to_sample(AACContext *ac)
                    apply_channel_coupling(ac, che, type, i, AFTER_IMDCT, apply_independent_coupling);
                che->present = 0;
            } else if (che) {
-                av_log(ac->avctx, AV_LOG_WARNING, "ChannelElement %d.%d missing \n", type, i);
+                av_log(ac->avctx, AV_LOG_VERBOSE, "ChannelElement %d.%d missing \n", type, i);
            }
        }
    }
--- a/libavdevice/iec61883.c
+++ b/libavdevice/iec61883.c
@ -350,7 +350,7 @@ static int iec61883_read_header(AVFormatContext *context)
    if (!dv->max_packets)
        dv->max_packets = 100;

-    if (dv->type == IEC61883_HDV) {
+    if (CONFIG_MPEGTS_DEMUXER && dv->type == IEC61883_HDV) {

        /* Init HDV receive */

@ -444,7 +444,7 @@ static int iec61883_close(AVFormatContext *context)
    pthread_mutex_destroy(&dv->mutex);
 #endif

-    if (dv->type == IEC61883_HDV) {
+    if (CONFIG_MPEGTS_DEMUXER && dv->type == IEC61883_HDV) {
        iec61883_mpeg2_recv_stop(dv->iec61883_mpeg2);
        iec61883_mpeg2_close(dv->iec61883_mpeg2);
        avpriv_mpegts_parse_close(dv->mpeg_demux);
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@ -519,6 +519,9 @@ OBJS-$(CONFIG_UNIX_PROTOCOL)             += unix.o

 OBJS-$(HAVE_LIBC_MSVCRT)                 += file_open.o

+# libavdevice dependencies
+OBJS-$(CONFIG_IEC61883_INDEV)            += dv.o
+
 # Windows resource file
 SLIBOBJS-$(HAVE_GNU_WINDRES)             += avformatres.o
Author	SHA1	Message	Date
Michael Niedermayer	d9bdf7d9ae	Changelog: release is 2.5 not "next" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-12-04 02:16:55 +01:00
Michael Niedermayer	a588e1e560	avcodec/aacdec: reduce noisiness of missing channel elements Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit `5fe026f2bd`) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-12-04 01:58:32 +01:00
Carl Eugen Hoyos	36e7385d0e	Fix standalone compilation of the iec61883 input device. (cherry picked from commit `963aa1daf8`) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-12-04 01:58:28 +01:00
Michael Niedermayer	5108323aa9	Update for 2.5 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-12-04 00:47:17 +01:00
 @ -1 +1 @@
 .4.git
 .5