Merge commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d'

* commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d':
  fate: add CVFC1_Sony_C to h264 conformance tests
  doc/APIchanges: add missing hashes and dates

Conflicts:
	doc/APIchanges
	tests/fate/h264.mak

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

3 files changed, 85 insertions, 32 deletions

diff --git a/doc/APIchanges b/doc/APIchanges
index cd7c4ca378..763ccf05ab 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -170,43 +170,43 @@ API changes, most recent first:
 2013-03-xx - xxxxxxx - lavc 55.2.0 - avcodec.h
   Add CODEC_FLAG_UNALIGNED to allow decoders to produce unaligned output.
 
-2013-xx-xx - lavfi 3.8.0
-  Move all content from avfiltergraph.h to avfilter.h. Deprecate
-  avfilterhraph.h, user applications should include just avfilter.h
-  Add avfilter_graph_alloc_filter(), deprecate avfilter_open() and
-  avfilter_graph_add_filter().
-  Add AVFilterContext.graph pointing to the AVFilterGraph that contains the
-  filter.
-  Add avfilter_init_str(), deprecate avfilter_init_filter().
-  Add avfilter_init_dict().
-  Add AVFilter.flags field and AVFILTER_FLAG_DYNAMIC_{INPUTS,OUTPUTS} flags.
-  Add avfilter_pad_count() for counting filter inputs/outputs.
-  Add avfilter_next(), deprecate av_filter_next().
-  Deprecate avfilter_uninit().
-
-2013-xx-xx - lavfi 3.7.0 - avfilter.h
-  Add AVFilter.priv_class for exporting filter options through the AVOptions API
-  in the similar way private options work in lavc and lavf.
-  Add avfilter_get_class().
+2013-04-11 - lavfi 3.8.0
+  38f0c07 - Move all content from avfiltergraph.h to avfilter.h. Deprecate
+            avfilterhraph.h, user applications should include just avfilter.h
+  bc1a985 - Add avfilter_graph_alloc_filter(), deprecate avfilter_open() and
+            avfilter_graph_add_filter().
+  1113672 - Add AVFilterContext.graph pointing to the AVFilterGraph that contains the
+            filter.
+  48a5ada - Add avfilter_init_str(), deprecate avfilter_init_filter().
+  1ba95a9 - Add avfilter_init_dict().
+  7cdd737 - Add AVFilter.flags field and AVFILTER_FLAG_DYNAMIC_{INPUTS,OUTPUTS} flags.
+  7e8fe4b - Add avfilter_pad_count() for counting filter inputs/outputs.
+  fa2a34c - Add avfilter_next(), deprecate av_filter_next().
+            Deprecate avfilter_uninit().
+
+2013-04-09 - lavfi 3.7.0 - avfilter.h
+  b439c99 - Add AVFilter.priv_class for exporting filter options through the
+            AVOptions API in the similar way private options work in lavc and lavf.
+  8114c10 - Add avfilter_get_class().
   Switch all filters to use AVOptions.
 
-2013-xx-xx - lavu 52.9.0 - pixdesc.h
+2013-03-19 - 2c328a9 - lavu 52.9.0 - pixdesc.h
   Add av_pix_fmt_count_planes() function for counting planes in a pixel format.
 
-2013-xx-xx - lavfi 3.6.0
+2013-03-16 - 42c7c61 - lavfi 3.6.0
   Add AVFilterGraph.nb_filters, deprecate AVFilterGraph.filter_count.
 
-2013-03-xx - Reference counted buffers - lavu 52.8.0, lavc 55.0.0, lavf 55.0.0,
+2013-03-08 - Reference counted buffers - lavu 52.8.0, lavc 55.0.0, lavf 55.0.0,
 lavd 54.0.0, lavfi 3.5.0
-  xxxxxxx, xxxxxxx - add a new API for reference counted buffers and buffer
+  8e401db, 1cec062 - add a new API for reference counted buffers and buffer
                      pools (new header libavutil/buffer.h).
-  xxxxxxx - add AVPacket.buf to allow reference counting for the AVPacket data.
+  1afddbe - add AVPacket.buf to allow reference counting for the AVPacket data.
             Add av_packet_from_data() function for constructing packets from
             av_malloc()ed data.
-  xxxxxxx - move AVFrame from lavc to lavu (new header libavutil/frame.h), add
+  7ecc2d4 - move AVFrame from lavc to lavu (new header libavutil/frame.h), add
             AVFrame.buf/extended_buf to allow reference counting for the AVFrame
             data. Add new API for working with reference-counted AVFrames.
-  xxxxxxx - add the refcounted_frames field to AVCodecContext to make audio and
+  759001c - add the refcounted_frames field to AVCodecContext to make audio and
             video decoders return reference-counted frames. Add get_buffer2()
             callback to AVCodecContext which allocates reference-counted frames.
             Add avcodec_default_get_buffer2() as the default get_buffer2()
@@ -224,30 +224,30 @@ lavd 54.0.0, lavfi 3.5.0
                 * qscale_table, qstride, qscale_type, mbskip_table, motion_val,
                   mb_type, dct_coeff, ref_index -- mpegvideo-specific tables,
                   which are not exported anymore.
-  xxxxxxx - switch libavfilter to use AVFrame instead of AVFilterBufferRef. Add
+  7e35037 - switch libavfilter to use AVFrame instead of AVFilterBufferRef. Add
             av_buffersrc_add_frame(), deprecate av_buffersrc_buffer().
             Add av_buffersink_get_frame() and av_buffersink_get_samples(),
             deprecate av_buffersink_read() and av_buffersink_read_samples().
             Deprecate AVFilterBufferRef and all functions for working with it.
 
-2013-xx-xx - xxxxxxx - lavu 52.8.0 - avstring.h
+2013-03-17 - 12c5c1d - lavu 52.8.0 - avstring.h
   Add av_isdigit, av_isgraph, av_isspace, av_isxdigit.
 
-2013-xx-xx - xxxxxxx - lavfi 3.4.0 - avfiltergraph.h
+2013-02-23 - 9f12235 - lavfi 3.4.0 - avfiltergraph.h
   Add resample_lavr_opts to AVFilterGraph for setting libavresample options
   for auto-inserted resample filters.
 
-2013-xx-xx - xxxxxxx - lavu 52.7.0 - dict.h
+2013-01-25 - 38c1466 - lavu 52.7.0 - dict.h
   Add av_dict_parse_string() to set multiple key/value pairs at once from a
   string.
 
-2013-01-xx - xxxxxxx - lavu 52.6.0 - avstring.h
+2013-01-25 - b85a5e8 - lavu 52.6.0 - avstring.h
   Add av_strnstr()
 
-2013-01-xx - xxxxxxx - lavu 52.5.0 - hmac.h
+2013-01-15 - 8ee288d - lavu 52.5.0 - hmac.h
   Add AVHMAC.
 
-2013-01-13 - xxxxxxx - lavc 54.87.100 / 54.36.0 - vdpau.h
+2013-01-13 - 44e065d - lavc 54.87.100 / 54.36.0 - vdpau.h
   Add AVVDPAUContext struct for VDPAU hardware-accelerated decoding.
 
 2013-01-12 - dae382b / 169fb94 - lavu 52.14.100 / 52.4.0 - pixdesc.h
diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak
index 2cbd5df0d2..0b336fcbe6 100644
--- a/tests/fate/h264.mak
+++ b/tests/fate/h264.mak
@@ -64,6 +64,7 @@ FATE_H264 = aud_mw_e                                                    \
             ci_mw_d                                                     \
             cvbs3_sony_c                                                \
             cvcanlma2_sony_c                                            \
+            cvfc1_sony_c                                                \
             cvfi1_sony_d                                                \
             cvfi1_sva_c                                                 \
             cvfi2_sony_h                                                \
@@ -266,6 +267,7 @@ fate-h264-conformance-ci1_ft_b:                   CMD = framecrc -vsync drop -i
 fate-h264-conformance-ci_mw_d:                    CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CI_MW_D.264
 fate-h264-conformance-cvbs3_sony_c:               CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVBS3_Sony_C.jsv
 fate-h264-conformance-cvcanlma2_sony_c:           CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVCANLMA2_Sony_C.jsv
+fate-h264-conformance-cvfc1_sony_c:               CMD = framecrc -flags unaligned -i $(SAMPLES)/h264-conformance/CVFC1_Sony_C.jsv
 fate-h264-conformance-cvfi1_sony_d:               CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVFI1_Sony_D.jsv
 fate-h264-conformance-cvfi1_sva_c:                CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVFI1_SVA_C.264
 fate-h264-conformance-cvfi2_sony_h:               CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVFI2_Sony_H.jsv
diff --git a/tests/ref/fate/h264-conformance-cvfc1_sony_c b/tests/ref/fate/h264-conformance-cvfc1_sony_c
new file mode 100644
index 0000000000..1abe67f3b3
--- /dev/null
+++ b/tests/ref/fate/h264-conformance-cvfc1_sony_c
@@ -0,0 +1,51 @@
+#tb 0: 1/25
+0,          0,          0,        1,    75600, 0x6f6a8c48
+0,          1,          1,        1,    75600, 0x4b7ac558
+0,          2,          2,        1,    75600, 0x907feda3
+0,          3,          3,        1,    75600, 0x7b2b17d2
+0,          4,          4,        1,    75600, 0x46d038e7
+0,          5,          5,        1,    75600, 0x90d463b3
+0,          6,          6,        1,    75600, 0xc00d7ec1
+0,          7,          7,        1,    75600, 0x10f69a60
+0,          8,          8,        1,    75600, 0x676aad50
+0,          9,          9,        1,    75600, 0x0a3fd3e0
+0,         10,         10,        1,    75600, 0xaee8fc87
+0,         11,         11,        1,    75600, 0xc9f41fbb
+0,         12,         12,        1,    75600, 0x183743dd
+0,         13,         13,        1,    75600, 0xf0385aa2
+0,         14,         14,        1,    75600, 0xad63782e
+0,         15,         15,        1,    75600, 0x9ed08c01
+0,         16,         16,        1,    75600, 0x79aba20e
+0,         17,         17,        1,    75600, 0x53d6c34c
+0,         18,         18,        1,    75600, 0x4cead515
+0,         19,         19,        1,    75600, 0xc701e3c8
+0,         20,         20,        1,    75600, 0xb278e37d
+0,         21,         21,        1,    75600, 0x02e6f95e
+0,         22,         22,        1,    75600, 0x5cdffef4
+0,         23,         23,        1,    75600, 0x6e0a1089
+0,         24,         24,        1,    75600, 0x23a919b5
+0,         25,         25,        1,    75600, 0x31f5391c
+0,         26,         26,        1,    75600, 0xaa2c3445
+0,         27,         27,        1,    75600, 0x42204340
+0,         28,         28,        1,    75600, 0x55924031
+0,         29,         29,        1,    75600, 0x6bc94d1b
+0,         30,         30,        1,    75600, 0x3e1a1e21
+0,         31,         31,        1,    75600, 0xaf4816fc
+0,         32,         32,        1,    75600, 0x322c1d18
+0,         33,         33,        1,    75600, 0xf59c1746
+0,         34,         34,        1,    75600, 0x875cfc24
+0,         35,         35,        1,    75600, 0x8657f65b
+0,         36,         36,        1,    75600, 0x7e78f95f
+0,         37,         37,        1,    75600, 0x7639e983
+0,         38,         38,        1,    75600, 0xcdaac5fa
+0,         39,         39,        1,    75600, 0x2b7ac473
+0,         40,         40,        1,    75600, 0x028cb98f
+0,         41,         41,        1,    75600, 0x023abda4
+0,         42,         42,        1,    75600, 0x9733ad92
+0,         43,         43,        1,    75600, 0xfb4f8cfe
+0,         44,         44,        1,    75600, 0xfef071b6
+0,         45,         45,        1,    75600, 0xf7513219
+0,         46,         46,        1,    75600, 0x9d6e3c98
+0,         47,         47,        1,    75600, 0xd5501ac7
+0,         48,         48,        1,    75600, 0xa00201f1
+0,         49,         49,        1,    75600, 0xee84e8c6